diff options
| author | Vesa-Matti Kari <vmkari@cc.helsinki.fi> | 2008-08-06 18:24:51 +0300 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-07 08:56:16 +1000 |
| commit | 421fae06be9e0dac45747494756b3580643815f9 (patch) | |
| tree | 8b390e53636092477c82304b7f7f10524df6fd1b /security | |
| parent | 15446235367fa4a621ff5abfa4b6ebbe25b33763 (diff) | |
| download | linux-3.10-421fae06be9e0dac45747494756b3580643815f9.tar.gz linux-3.10-421fae06be9e0dac45747494756b3580643815f9.tar.bz2 linux-3.10-421fae06be9e0dac45747494756b3580643815f9.zip | |
selinux: conditional expression type validation was off-by-one
expr_isvalid() in conditional.c was off-by-one and allowed
invalid expression type COND_LAST. However, it is this header file
that needs to be fixed. That way the if-statement's disjunction's
second component reads more naturally, "if expr type is greater than
the last allowed value" ( rather than using ">=" in conditional.c):
if (expr->expr_type <= 0 || expr->expr_type > COND_LAST)
Signed-off-by: Vesa-Matti Kari <vmkari@cc.helsinki.fi>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/ss/conditional.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/conditional.h b/security/selinux/ss/conditional.h index 65b9f8366e9..53ddb013ae5 100644 --- a/security/selinux/ss/conditional.h +++ b/security/selinux/ss/conditional.h @@ -28,7 +28,7 @@ struct cond_expr { #define COND_XOR 5 /* bool ^ bool */ #define COND_EQ 6 /* bool == bool */ #define COND_NEQ 7 /* bool != bool */ -#define COND_LAST 8 +#define COND_LAST COND_NEQ __u32 expr_type; __u32 bool; struct cond_expr *next; |