Commit 99039e13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 72a8d129 c4bacefb

kernel/auditsc.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -243,10 +243,11 @@ static inline int open_arg(int flags, int mask) 




static int audit_match_perm(struct audit_context *ctx, int mask)

static int audit_match_perm(struct audit_context *ctx, int mask)

{

{

	unsigned n;

	if (unlikely(!ctx))

	if (unlikely(!ctx))

		return 0;

		return 0;





	unsigned n = ctx->major;

	n = ctx->major;

	switch (audit_classify_syscall(ctx->arch, n)) {

	switch (audit_classify_syscall(ctx->arch, n)) {

	case 0:	/* native */

	case 0:	/* native */

		if ((mask & AUDIT_PERM_WRITE) &&

		if ((mask & AUDIT_PERM_WRITE) &&