diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/audit.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index 08b38bf13eb9..a40641954c29 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
| @@ -238,11 +238,10 @@ static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid | |||
| 238 | if (unlikely(!audit_dummy_context())) | 238 | if (unlikely(!audit_dummy_context())) |
| 239 | __audit_ipc_set_perm(qbytes, uid, gid, mode); | 239 | __audit_ipc_set_perm(qbytes, uid, gid, mode); |
| 240 | } | 240 | } |
| 241 | static inline int audit_bprm(struct linux_binprm *bprm) | 241 | static inline void audit_bprm(struct linux_binprm *bprm) |
| 242 | { | 242 | { |
| 243 | if (unlikely(!audit_dummy_context())) | 243 | if (unlikely(!audit_dummy_context())) |
| 244 | __audit_bprm(bprm); | 244 | __audit_bprm(bprm); |
| 245 | return 0; | ||
| 246 | } | 245 | } |
| 247 | static inline int audit_socketcall(int nargs, unsigned long *args) | 246 | static inline int audit_socketcall(int nargs, unsigned long *args) |
| 248 | { | 247 | { |
| @@ -369,10 +368,8 @@ static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp) | |||
| 369 | static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid, | 368 | static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid, |
| 370 | gid_t gid, umode_t mode) | 369 | gid_t gid, umode_t mode) |
| 371 | { } | 370 | { } |
| 372 | static inline int audit_bprm(struct linux_binprm *bprm) | 371 | static inline void audit_bprm(struct linux_binprm *bprm) |
| 373 | { | 372 | { } |
| 374 | return 0; | ||
| 375 | } | ||
| 376 | static inline int audit_socketcall(int nargs, unsigned long *args) | 373 | static inline int audit_socketcall(int nargs, unsigned long *args) |
| 377 | { | 374 | { |
| 378 | return 0; | 375 | return 0; |
