mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 22:51:35 +00:00
apparmor: Remove -W1 warnings
Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-By: Steve Beattie <sbeattie@ubuntu.com>
This commit is contained in:
parent
17322cc3f9
commit
04266236b1
@ -752,7 +752,6 @@ int aa_change_profile(const char *ns_name, const char *hname, bool onexec,
|
||||
bool permtest)
|
||||
{
|
||||
const struct cred *cred;
|
||||
struct aa_task_cxt *cxt;
|
||||
struct aa_profile *profile, *target = NULL;
|
||||
struct aa_namespace *ns = NULL;
|
||||
struct file_perms perms = {};
|
||||
@ -772,7 +771,6 @@ int aa_change_profile(const char *ns_name, const char *hname, bool onexec,
|
||||
}
|
||||
|
||||
cred = get_current_cred();
|
||||
cxt = cred->security;
|
||||
profile = aa_cred_profile(cred);
|
||||
|
||||
/*
|
||||
|
@ -469,7 +469,6 @@ static int apparmor_file_lock(struct file *file, unsigned int cmd)
|
||||
static int common_mmap(int op, struct file *file, unsigned long prot,
|
||||
unsigned long flags)
|
||||
{
|
||||
struct dentry *dentry;
|
||||
int mask = 0;
|
||||
|
||||
if (!file || !file->f_security)
|
||||
@ -486,7 +485,6 @@ static int common_mmap(int op, struct file *file, unsigned long prot,
|
||||
if (prot & PROT_EXEC)
|
||||
mask |= AA_EXEC_MMAP;
|
||||
|
||||
dentry = file->f_path.dentry;
|
||||
return common_file_perm(op, file, mask);
|
||||
}
|
||||
|
||||
@ -507,11 +505,9 @@ static int apparmor_getprocattr(struct task_struct *task, char *name,
|
||||
char **value)
|
||||
{
|
||||
int error = -ENOENT;
|
||||
struct aa_profile *profile;
|
||||
/* released below */
|
||||
const struct cred *cred = get_task_cred(task);
|
||||
struct aa_task_cxt *cxt = cred->security;
|
||||
profile = aa_cred_profile(cred);
|
||||
|
||||
if (strcmp(name, "current") == 0)
|
||||
error = aa_getprocattr(aa_newest_version(cxt->profile),
|
||||
|
Loading…
Reference in New Issue
Block a user