aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/audit.h
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2016-06-28 12:07:50 -0400
committerPaul Moore <paul@paul-moore.com>2016-06-28 15:48:48 -0400
commit3f5be2da8565c1cce5655bb0948fcc957c6eb6c6 (patch)
tree114b88bf2c039380ce333b5bca2265ebf9c4fa8c /include/linux/audit.h
parent76a658c20efd541a62838d9ff68ce94170d7a549 (diff)
audit: move audit_get_tty to reduce scope and kabi changes
The only users of audit_get_tty and audit_put_tty are internal to audit, so move it out of include/linux/audit.h to kernel.h and create a proper function rather than inlining it. This also reduces kABI changes. Suggested-by: Paul Moore <pmoore@redhat.com> Signed-off-by: Richard Guy Briggs <rgb@redhat.com> [PM: line wrapped description] Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'include/linux/audit.h')
-rw-r--r--include/linux/audit.h24
1 files changed, 0 insertions, 24 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 32cdafb312d8..b40ed5df5542 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -26,7 +26,6 @@
26#include <linux/sched.h> 26#include <linux/sched.h>
27#include <linux/ptrace.h> 27#include <linux/ptrace.h>
28#include <uapi/linux/audit.h> 28#include <uapi/linux/audit.h>
29#include <linux/tty.h>
30 29
31#define AUDIT_INO_UNSET ((unsigned long)-1) 30#define AUDIT_INO_UNSET ((unsigned long)-1)
32#define AUDIT_DEV_UNSET ((dev_t)-1) 31#define AUDIT_DEV_UNSET ((dev_t)-1)
@@ -344,23 +343,6 @@ static inline unsigned int audit_get_sessionid(struct task_struct *tsk)
344 return tsk->sessionid; 343 return tsk->sessionid;
345} 344}
346 345
347static inline struct tty_struct *audit_get_tty(struct task_struct *tsk)
348{
349 struct tty_struct *tty = NULL;
350 unsigned long flags;
351
352 spin_lock_irqsave(&tsk->sighand->siglock, flags);
353 if (tsk->signal)
354 tty = tty_kref_get(tsk->signal->tty);
355 spin_unlock_irqrestore(&tsk->sighand->siglock, flags);
356 return tty;
357}
358
359static inline void audit_put_tty(struct tty_struct *tty)
360{
361 tty_kref_put(tty);
362}
363
364extern void __audit_ipc_obj(struct kern_ipc_perm *ipcp); 346extern void __audit_ipc_obj(struct kern_ipc_perm *ipcp);
365extern void __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, umode_t mode); 347extern void __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, umode_t mode);
366extern void __audit_bprm(struct linux_binprm *bprm); 348extern void __audit_bprm(struct linux_binprm *bprm);
@@ -518,12 +500,6 @@ static inline unsigned int audit_get_sessionid(struct task_struct *tsk)
518{ 500{
519 return -1; 501 return -1;
520} 502}
521static inline struct tty_struct *audit_get_tty(struct task_struct *tsk)
522{
523 return NULL;
524}
525static inline void audit_put_tty(struct tty_struct *tty)
526{ }
527static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp) 503static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp)
528{ } 504{ }
529static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid, 505static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid,