aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-02 11:04:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-02 11:04:47 -0700
commit99039e1352fa451bd46e2c020dc78bcaf2a159d9 (patch)
treee12d929e43525e1153418e431646399722dfa195 /kernel
parent72a8d129cf5811b77f0d6c8acef9ac34a12bccf4 (diff)
parentc4bacefb7aaf49da11a695f29d85d40909f17693 (diff)
downloadkernel_samsung_crespo-99039e1352fa451bd46e2c020dc78bcaf2a159d9.zip
kernel_samsung_crespo-99039e1352fa451bd46e2c020dc78bcaf2a159d9.tar.gz
kernel_samsung_crespo-99039e1352fa451bd46e2c020dc78bcaf2a159d9.tar.bz2
Merge branch 'audit.b57' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b57' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: [PATCH] audit: Moved variable declaration to beginning of function
Diffstat (limited to 'kernel')
-rw-r--r--kernel/auditsc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 972f8e6..59cedfb 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -243,10 +243,11 @@ static inline int open_arg(int flags, int mask)
static int audit_match_perm(struct audit_context *ctx, int mask)
{
+ unsigned n;
if (unlikely(!ctx))
return 0;
- unsigned n = ctx->major;
+ n = ctx->major;
switch (audit_classify_syscall(ctx->arch, n)) {
case 0: /* native */
if ((mask & AUDIT_PERM_WRITE) &&