audit: Simplify and correct audit_log_capset

ebiederm · eparis · commit ca24a23ebca1 · 2014-01-13T22:26:48.000-05:00
- Always report the current process as capset now always only works on
  the current process.  This prevents reporting 0 or a random pid in
  a random pid namespace.

- Don't bother to pass the pid as is available.

Signed-off-by: "Eric W. Biederman" &lt;ebiederm@xmission.com&gt;
(cherry picked from commit bcc85f0af31af123e32858069eb2ad8f39f90e67)
(cherry picked from commit f911cac4556a7a23e0b3ea850233d13b32328692)

Signed-off-by: Richard Guy Briggs &lt;rgb@redhat.com&gt;
[eparis: fix build error when audit disabled]
Signed-off-by: Eric Paris &lt;eparis@redhat.com&gt;
diff --git a/include/linux/audit.h b/include/linux/audit.h
@@ -220,7 +220,7 @@ extern void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat);
 extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
 				  const struct cred *new,
 				  const struct cred *old);
-extern void __audit_log_capset(pid_t pid, const struct cred *new, const struct cred *old);
+extern void __audit_log_capset(const struct cred *new, const struct cred *old);
 extern void __audit_mmap_fd(int fd, int flags);
 
 static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp)
@@ -285,11 +285,11 @@ 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,
+static inline void audit_log_capset(const struct cred *new,
 				   const struct cred *old)
 {
 	if (unlikely(!audit_dummy_context()))
-		__audit_log_capset(pid, new, old);
+		__audit_log_capset(new, old);
 }
 
 static inline void audit_mmap_fd(int fd, int flags)
@@ -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)
 { }
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
@@ -2321,18 +2321,16 @@ int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
 
 /**
  * __audit_log_capset - store information about the arguments to the capset syscall
- * @pid: target pid of the capset call
  * @new: the new credentials
  * @old: the old (current) credentials
  *
  * Record the aguments userspace sent to sys_capset for later printing by the
  * audit system if applicable
  */
-void __audit_log_capset(pid_t pid,
-		       const struct cred *new, const struct cred *old)
+void __audit_log_capset(const struct cred *new, const struct cred *old)
 {
 	struct audit_context *context = current->audit_context;
-	context->capset.pid = pid;
+	context->capset.pid = task_pid_nr(current);
 	context->capset.cap.effective   = new->cap_effective;
 	context->capset.cap.inheritable = new->cap_effective;
 	context->capset.cap.permitted   = new->cap_permitted;
diff --git a/kernel/capability.c b/kernel/capability.c
@@ -277,7 +277,7 @@ SYSCALL_DEFINE2(capset, cap_user_header_t, header, const cap_user_data_t, data)
 	if (ret < 0)
 		goto error;
 
-	audit_log_capset(pid, new, current_cred());
+	audit_log_capset(new, current_cred());
 
 	return commit_creds(new);
 

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ extern void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat);`
`220`	`220`	`extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm,`
`221`	`221`	`const struct cred *new,`
`222`	`222`	`const struct cred *old);`
`223`		`-extern void __audit_log_capset(pid_t pid, const struct cred new, const struct cred old);`
	`223`	`+extern void __audit_log_capset(const struct cred new, const struct cred old);`
`224`	`224`	`extern void __audit_mmap_fd(int fd, int flags);`
`225`	`225`
`226`	`226`	`static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp)`
`@@ -285,11 +285,11 @@ static inline int audit_log_bprm_fcaps(struct linux_binprm *bprm,`
`285`	`285`	`return 0;`
`286`	`286`	`}`
`287`	`287`
`288`		`-static inline void audit_log_capset(pid_t pid, const struct cred *new,`
	`288`	`+static inline void audit_log_capset(const struct cred *new,`
`289`	`289`	`const struct cred *old)`
`290`	`290`	`{`
`291`	`291`	`if (unlikely(!audit_dummy_context()))`
`292`		`- __audit_log_capset(pid, new, old);`
	`292`	`+ __audit_log_capset(new, old);`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`static inline void audit_mmap_fd(int fd, int flags)`
`@@ -397,8 +397,8 @@ static inline int audit_log_bprm_fcaps(struct linux_binprm *bprm,`
`397`	`397`	`{`
`398`	`398`	`return 0;`
`399`	`399`	`}`
`400`		`-static inline void audit_log_capset(pid_t pid, const struct cred *new,`
`401`		`- const struct cred *old)`
	`400`	`+static inline void audit_log_capset(const struct cred *new,`
	`401`	`+ const struct cred *old)`
`402`	`402`	`{ }`
`403`	`403`	`static inline void audit_mmap_fd(int fd, int flags)`
`404`	`404`	`{ }`