Commit 42f74461 authored May 20, 2013 by Richard Guy Briggs Committed by Eric Paris Nov 05, 2013

audit: change decimal constant to macro for invalid uid



SFR reported this 2013-05-15:

> After merging the final tree, today's linux-next build (i386 defconfig)
> produced this warning:
>
> kernel/auditfilter.c: In function 'audit_data_to_entry':
> kernel/auditfilter.c:426:3: warning: this decimal constant is unsigned only
> in ISO C90 [enabled by default]
>
> Introduced by commit 780a7654 ("audit: Make testing for a valid
> loginuid explicit") from Linus' tree.

Replace this decimal constant in the code with a macro to make it more readable
(add to the unsigned cast to quiet the warning).

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>

parent 0868a5e1

include/uapi/linux/audit.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -380,6 +380,8 @@ struct audit_tty_status {
		__u32 log_passwd; /* 1 = enabled, 0 = disabled */
		};

		#define AUDIT_UID_UNSET (unsigned int)-1

		/* audit_rule_data supports filter rules with both integer and string
		* fields. It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
		* AUDIT_LIST_RULES requests.

kernel/auditfilter.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -423,7 +423,7 @@ static struct audit_entry audit_data_to_entry(struct audit_rule_data data,
		f->lsm_rule = NULL;

		/* Support legacy tests for a valid loginuid */
		if ((f->type == AUDIT_LOGINUID) && (f->val == ~0U)) {
		if ((f->type == AUDIT_LOGINUID) && (f->val == AUDIT_UID_UNSET)) {
		f->type = AUDIT_LOGINUID_SET;
		f->val = 0;
		}

Admin message