diff options
Diffstat (limited to 'security/apparmor/lsm.c')
| -rw-r--r-- | security/apparmor/lsm.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index fb99e18123b..99810009333 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -145,7 +145,7 @@ static int apparmor_capable(const struct cred *cred, struct user_namespace *ns,  	if (!error) {  		profile = aa_cred_profile(cred);  		if (!unconfined(profile)) -			error = aa_capable(current, profile, cap, audit); +			error = aa_capable(profile, cap, audit);  	}  	return error;  } @@ -751,7 +751,7 @@ module_param_named(enabled, apparmor_enabled, bool, S_IRUGO);  static int __init apparmor_enabled_setup(char *str)  {  	unsigned long enabled; -	int error = strict_strtoul(str, 0, &enabled); +	int error = kstrtoul(str, 0, &enabled);  	if (!error)  		apparmor_enabled = enabled ? 1 : 0;  	return 1;  | 
