diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-30 12:42:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-30 12:42:07 +1000 |
| commit | 59c268fbd279a1126d6e80da06996d8919f89b38 (patch) | |
| tree | 991f7e9e7ee8def31fe522ff19f9c6e7897d0d65 | |
| parent | a4021f2d15e495adc6bed570f6ca97f1d6cfe5bb (diff) | |
| parent | 4b3e4ed6b0d958d7fb2f160bb8ebfb4f0db19382 (diff) | |
Merge remote-tracking branch 'audit/next'
| -rw-r--r-- | kernel/audit.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 4b7d49868ce1..b4590029e92e 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1999,22 +1999,10 @@ void audit_log_cap(struct audit_buffer *ab, char *prefix, kernel_cap_t *cap) static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name) { - kernel_cap_t *perm = &name->fcap.permitted; - kernel_cap_t *inh = &name->fcap.inheritable; - int log = 0; - - if (!cap_isclear(*perm)) { - audit_log_cap(ab, "cap_fp", perm); - log = 1; - } - if (!cap_isclear(*inh)) { - audit_log_cap(ab, "cap_fi", inh); - log = 1; - } - - if (log) - audit_log_format(ab, " cap_fe=%d cap_fver=%x", - name->fcap.fE, name->fcap_ver); + audit_log_cap(ab, "cap_fp", &name->fcap.permitted); + audit_log_cap(ab, "cap_fi", &name->fcap.inheritable); + audit_log_format(ab, " cap_fe=%d cap_fver=%x", + name->fcap.fE, name->fcap_ver); } static inline int audit_copy_fcaps(struct audit_names *name, |