[PATCH] audit: fix build error when disable audit

Gao feng gaofeng at cn.fujitsu.com
Thu Dec 19 02:34:29 UTC 2013


kernel/capability.c: In function ‘SYSC_capset’:
kernel/capability.c:280:2: warning: passing argument 1 of ‘audit_log_capset’ makes integer from pointer without a cast [enabled by default]
  audit_log_capset(new, current_cred());
  ^
In file included from kernel/capability.c:10:0:
include/linux/audit.h:400:20: note: expected ‘pid_t’ but argument is of type ‘struct cred *’
 static inline void audit_log_capset(pid_t pid, const struct cred *new,
                    ^
kernel/capability.c:280:2: error: too few arguments to function ‘audit_log_capset’
  audit_log_capset(new, current_cred());
  ^
In file included from kernel/capability.c:10:0:
include/linux/audit.h:400:20: note: declared here
 static inline void audit_log_capset(pid_t pid, const struct cred *new,
                    ^
make[1]: *** [kernel/capability.o] Error 1

Signed-off-by: Gao feng <gaofeng at cn.fujitsu.com>
---
 include/linux/audit.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/audit.h b/include/linux/audit.h
index b4d5160..6976219 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -397,8 +397,8 @@ static inline int audit_log_bprm_fcaps(struct linux_binprm *bprm,
 {
 	return 0;
 }
-static inline void audit_log_capset(pid_t pid, const struct cred *new,
-				   const struct cred *old)
+static inline void audit_log_capset(const struct cred *new,
+				    const struct cred *old)
 { }
 static inline void audit_mmap_fd(int fd, int flags)
 { }
-- 
1.8.3.1





More information about the Linux-audit mailing list