Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5ac3a9c26c1cc4861d9cdd8b293fecbfcdc81afe

Authored by Al Viro
1 parent d51374adf5
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] don't bother with aux entires for dummy context 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 3 changed files with 16 additions and 16 deletions Side-by-side Diff

... ... @@ -159,7 +159,7 @@
159 159 #ifdef CONFIG_AUDITSYSCALL
160 160 void putname(const char *name)
161 161 {
162   - if (unlikely(current->audit_context))
  162 + if (unlikely(!audit_dummy_context()))
163 163 audit_putname(name);
164 164 else
165 165 __putname(name);
... ... @@ -1125,7 +1125,7 @@
1125 1125 retval = link_path_walk(name, nd);
1126 1126 out:
1127 1127 if (likely(retval == 0)) {
1128   - if (unlikely(current->audit_context && nd && nd->dentry &&
  1128 + if (unlikely(!audit_dummy_context() && nd && nd->dentry &&
1129 1129 nd->dentry->d_inode))
1130 1130 audit_inode(name, nd->dentry->d_inode);
1131 1131 }
include/linux/audit.h
Diff comments   View file @ 5ac3a9c
... ... @@ -336,21 +336,21 @@
336 336 }
337 337 static inline void audit_getname(const char *name)
338 338 {
339   - if (unlikely(current->audit_context))
  339 + if (unlikely(!audit_dummy_context()))
340 340 __audit_getname(name);
341 341 }
342 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 344 __audit_inode(name, inode);
345 345 }
346 346 static inline void audit_inode_child(const char *dname,
347 347 const struct inode *inode,
348 348 const struct inode *parent) {
349   - if (unlikely(current->audit_context))
  349 + if (unlikely(!audit_dummy_context()))
350 350 __audit_inode_child(dname, inode, parent);
351 351 }
352 352 static inline void audit_inode_update(const struct inode *inode) {
353   - if (unlikely(current->audit_context))
  353 + if (unlikely(!audit_dummy_context()))
354 354 __audit_inode_update(inode);
355 355 }
356 356  
357 357  
358 358  
359 359  
360 360  
361 361  
362 362  
... ... @@ -375,43 +375,43 @@
375 375  
376 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 379 return __audit_ipc_obj(ipcp);
380 380 return 0;
381 381 }
382 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 385 return __audit_ipc_set_perm(qbytes, uid, gid, mode);
386 386 return 0;
387 387 }
388 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 391 return __audit_mq_open(oflag, mode, u_attr);
392 392 return 0;
393 393 }
394 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 397 return __audit_mq_timedsend(mqdes, msg_len, msg_prio, u_abs_timeout);
398 398 return 0;
399 399 }
400 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 403 return __audit_mq_timedreceive(mqdes, msg_len, u_msg_prio, u_abs_timeout);
404 404 return 0;
405 405 }
406 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 409 return __audit_mq_notify(mqdes, u_notification);
410 410 return 0;
411 411 }
412 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 415 return __audit_mq_getsetattr(mqdes, mqstat);
416 416 return 0;
417 417 }
... ... @@ -1676,7 +1676,7 @@
1676 1676 unsigned long p, next;
1677 1677 void *to;
1678 1678  
1679   - if (likely(!audit_enabled || !context))
  1679 + if (likely(!audit_enabled || !context || context->dummy))
1680 1680 return 0;
1681 1681  
1682 1682 ax = kmalloc(sizeof(*ax) + PAGE_SIZE * MAX_ARG_PAGES - bprm->p,
... ... @@ -1714,7 +1714,7 @@
1714 1714 struct audit_aux_data_socketcall *ax;
1715 1715 struct audit_context *context = current->audit_context;
1716 1716  
1717   - if (likely(!context))
  1717 + if (likely(!context || context->dummy))
1718 1718 return 0;
1719 1719  
1720 1720 ax = kmalloc(sizeof(*ax) + nargs * sizeof(unsigned long), GFP_KERNEL);
... ... @@ -1742,7 +1742,7 @@
1742 1742 struct audit_aux_data_sockaddr *ax;
1743 1743 struct audit_context *context = current->audit_context;
1744 1744  
1745   - if (likely(!context))
  1745 + if (likely(!context || context->dummy))
1746 1746 return 0;
1747 1747  
1748 1748 ax = kmalloc(sizeof(*ax) + len, GFP_KERNEL);