Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 14:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

apparmor: fix module parameter handling

Browse Source 
The 'aabool' wrappers actually pass off to the 'bool' parse functions,
so you should use the same check function.  Similarly for aauint and
uint.

(Note that 'bool' module parameters also allow 'int', which is why you
got away with this, but that's changing very soon.)

Cc: linux-security-module@vger.kernel.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
Rusty Russell 2011-12-15 13:41:32 +10:30 committed by James Morris
parent 735e93c704
commit b8aa09fd88
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/apparmor/lsm.c
View File

@ -671,7 +671,7 @@ static struct security_operations apparmor_ops = {
static int param_set_aabool(const char *val, const struct kernel_param *kp); static int param_set_aabool(const char *val, const struct kernel_param *kp);
static int param_get_aabool(char *buffer, const struct kernel_param *kp); static int param_get_aabool(char *buffer, const struct kernel_param *kp);
#define param_check_aabool(name, p) __param_check(name, p, int) #define param_check_aabool param_check_bool
static struct kernel_param_ops param_ops_aabool = { static struct kernel_param_ops param_ops_aabool = {
.set = param_set_aabool, .set = param_set_aabool,
.get = param_get_aabool .get = param_get_aabool
@ -679,7 +679,7 @@ static struct kernel_param_ops param_ops_aabool = {
static int param_set_aauint(const char *val, const struct kernel_param *kp); static int param_set_aauint(const char *val, const struct kernel_param *kp);
static int param_get_aauint(char *buffer, const struct kernel_param *kp); static int param_get_aauint(char *buffer, const struct kernel_param *kp);
#define param_check_aauint(name, p) __param_check(name, p, int) #define param_check_aauint param_check_uint
static struct kernel_param_ops param_ops_aauint = { static struct kernel_param_ops param_ops_aauint = {
.set = param_set_aauint, .set = param_set_aauint,
.get = param_get_aauint .get = param_get_aauint
@ -687,7 +687,7 @@ static struct kernel_param_ops param_ops_aauint = {
static int param_set_aalockpolicy(const char *val, const struct kernel_param *kp); static int param_set_aalockpolicy(const char *val, const struct kernel_param *kp);
static int param_get_aalockpolicy(char *buffer, const struct kernel_param *kp); static int param_get_aalockpolicy(char *buffer, const struct kernel_param *kp);
#define param_check_aalockpolicy(name, p) __param_check(name, p, int) #define param_check_aalockpolicy param_check_bool
static struct kernel_param_ops param_ops_aalockpolicy = { static struct kernel_param_ops param_ops_aalockpolicy = {
.set = param_set_aalockpolicy, .set = param_set_aalockpolicy,
.get = param_get_aalockpolicy .get = param_get_aalockpolicy