diff options
Diffstat (limited to 'include/linux/audit.h')
-rw-r--r-- | include/linux/audit.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index 3f736d658218..64f9f9e56ac5 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
@@ -336,21 +336,21 @@ static inline int audit_dummy_context(void) | |||
336 | } | 336 | } |
337 | static inline void audit_getname(const char *name) | 337 | static inline void audit_getname(const char *name) |
338 | { | 338 | { |
339 | if (unlikely(current->audit_context)) | 339 | if (unlikely(!audit_dummy_context())) |
340 | __audit_getname(name); | 340 | __audit_getname(name); |
341 | } | 341 | } |
342 | static inline void audit_inode(const char *name, const struct inode *inode) { | 342 | static inline void audit_inode(const char *name, const struct inode *inode) { |
343 | if (unlikely(current->audit_context)) | 343 | if (unlikely(!audit_dummy_context())) |
344 | __audit_inode(name, inode); | 344 | __audit_inode(name, inode); |
345 | } | 345 | } |
346 | static inline void audit_inode_child(const char *dname, | 346 | static inline void audit_inode_child(const char *dname, |
347 | const struct inode *inode, | 347 | const struct inode *inode, |
348 | const struct inode *parent) { | 348 | const struct inode *parent) { |
349 | if (unlikely(current->audit_context)) | 349 | if (unlikely(!audit_dummy_context())) |
350 | __audit_inode_child(dname, inode, parent); | 350 | __audit_inode_child(dname, inode, parent); |
351 | } | 351 | } |
352 | static inline void audit_inode_update(const struct inode *inode) { | 352 | static inline void audit_inode_update(const struct inode *inode) { |
353 | if (unlikely(current->audit_context)) | 353 | if (unlikely(!audit_dummy_context())) |
354 | __audit_inode_update(inode); | 354 | __audit_inode_update(inode); |
355 | } | 355 | } |
356 | 356 | ||
@@ -375,43 +375,43 @@ extern int __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat); | |||
375 | 375 | ||
376 | static inline int audit_ipc_obj(struct kern_ipc_perm *ipcp) | 376 | static inline int audit_ipc_obj(struct kern_ipc_perm *ipcp) |
377 | { | 377 | { |
378 | if (unlikely(current->audit_context)) | 378 | if (unlikely(!audit_dummy_context())) |
379 | return __audit_ipc_obj(ipcp); | 379 | return __audit_ipc_obj(ipcp); |
380 | return 0; | 380 | return 0; |
381 | } | 381 | } |
382 | static inline int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode) | 382 | static inline int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode) |
383 | { | 383 | { |
384 | if (unlikely(current->audit_context)) | 384 | if (unlikely(!audit_dummy_context())) |
385 | return __audit_ipc_set_perm(qbytes, uid, gid, mode); | 385 | return __audit_ipc_set_perm(qbytes, uid, gid, mode); |
386 | return 0; | 386 | return 0; |
387 | } | 387 | } |
388 | static inline int audit_mq_open(int oflag, mode_t mode, struct mq_attr __user *u_attr) | 388 | static inline int audit_mq_open(int oflag, mode_t mode, struct mq_attr __user *u_attr) |
389 | { | 389 | { |
390 | if (unlikely(current->audit_context)) | 390 | if (unlikely(!audit_dummy_context())) |
391 | return __audit_mq_open(oflag, mode, u_attr); | 391 | return __audit_mq_open(oflag, mode, u_attr); |
392 | return 0; | 392 | return 0; |
393 | } | 393 | } |
394 | static inline int audit_mq_timedsend(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec __user *u_abs_timeout) | 394 | static inline int audit_mq_timedsend(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec __user *u_abs_timeout) |
395 | { | 395 | { |
396 | if (unlikely(current->audit_context)) | 396 | if (unlikely(!audit_dummy_context())) |
397 | return __audit_mq_timedsend(mqdes, msg_len, msg_prio, u_abs_timeout); | 397 | return __audit_mq_timedsend(mqdes, msg_len, msg_prio, u_abs_timeout); |
398 | return 0; | 398 | return 0; |
399 | } | 399 | } |
400 | static inline int audit_mq_timedreceive(mqd_t mqdes, size_t msg_len, unsigned int __user *u_msg_prio, const struct timespec __user *u_abs_timeout) | 400 | static inline int audit_mq_timedreceive(mqd_t mqdes, size_t msg_len, unsigned int __user *u_msg_prio, const struct timespec __user *u_abs_timeout) |
401 | { | 401 | { |
402 | if (unlikely(current->audit_context)) | 402 | if (unlikely(!audit_dummy_context())) |
403 | return __audit_mq_timedreceive(mqdes, msg_len, u_msg_prio, u_abs_timeout); | 403 | return __audit_mq_timedreceive(mqdes, msg_len, u_msg_prio, u_abs_timeout); |
404 | return 0; | 404 | return 0; |
405 | } | 405 | } |
406 | static inline int audit_mq_notify(mqd_t mqdes, const struct sigevent __user *u_notification) | 406 | static inline int audit_mq_notify(mqd_t mqdes, const struct sigevent __user *u_notification) |
407 | { | 407 | { |
408 | if (unlikely(current->audit_context)) | 408 | if (unlikely(!audit_dummy_context())) |
409 | return __audit_mq_notify(mqdes, u_notification); | 409 | return __audit_mq_notify(mqdes, u_notification); |
410 | return 0; | 410 | return 0; |
411 | } | 411 | } |
412 | static inline int audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat) | 412 | static inline int audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat) |
413 | { | 413 | { |
414 | if (unlikely(current->audit_context)) | 414 | if (unlikely(!audit_dummy_context())) |
415 | return __audit_mq_getsetattr(mqdes, mqstat); | 415 | return __audit_mq_getsetattr(mqdes, mqstat); |
416 | return 0; | 416 | return 0; |
417 | } | 417 | } |