diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/auditsc.c | 6 | ||||
-rw-r--r-- | kernel/capability.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 90594c9f7552..df1e685809e1 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -2321,18 +2321,16 @@ int __audit_log_bprm_fcaps(struct linux_binprm *bprm, | |||
2321 | 2321 | ||
2322 | /** | 2322 | /** |
2323 | * __audit_log_capset - store information about the arguments to the capset syscall | 2323 | * __audit_log_capset - store information about the arguments to the capset syscall |
2324 | * @pid: target pid of the capset call | ||
2325 | * @new: the new credentials | 2324 | * @new: the new credentials |
2326 | * @old: the old (current) credentials | 2325 | * @old: the old (current) credentials |
2327 | * | 2326 | * |
2328 | * Record the aguments userspace sent to sys_capset for later printing by the | 2327 | * Record the aguments userspace sent to sys_capset for later printing by the |
2329 | * audit system if applicable | 2328 | * audit system if applicable |
2330 | */ | 2329 | */ |
2331 | void __audit_log_capset(pid_t pid, | 2330 | void __audit_log_capset(const struct cred *new, const struct cred *old) |
2332 | const struct cred *new, const struct cred *old) | ||
2333 | { | 2331 | { |
2334 | struct audit_context *context = current->audit_context; | 2332 | struct audit_context *context = current->audit_context; |
2335 | context->capset.pid = pid; | 2333 | context->capset.pid = task_pid_nr(current); |
2336 | context->capset.cap.effective = new->cap_effective; | 2334 | context->capset.cap.effective = new->cap_effective; |
2337 | context->capset.cap.inheritable = new->cap_effective; | 2335 | context->capset.cap.inheritable = new->cap_effective; |
2338 | context->capset.cap.permitted = new->cap_permitted; | 2336 | context->capset.cap.permitted = new->cap_permitted; |
diff --git a/kernel/capability.c b/kernel/capability.c index 4e66bf9275b0..34019c57888d 100644 --- 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) | |||
277 | if (ret < 0) | 277 | if (ret < 0) |
278 | goto error; | 278 | goto error; |
279 | 279 | ||
280 | audit_log_capset(pid, new, current_cred()); | 280 | audit_log_capset(new, current_cred()); |
281 | 281 | ||
282 | return commit_creds(new); | 282 | return commit_creds(new); |
283 | 283 | ||