aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2013-04-19 13:23:09 -0400
committerEric Paris <eparis@redhat.com>2013-04-30 15:31:28 -0400
commitdc9eb698f441889f2d7926b1cc6f1e14f0787f00 (patch)
treeacdd37f268633b38b370fe0725f57ccd0d4fcadc /include/linux
parent18900909163758baf2152c9102b1a0953f7f1c30 (diff)
audit: stop pushing loginid, uid, sessionid as arguments
We always use current. Stop pulling this when the skb comes in and pushing it around as arguments. Just get it at the end when you need it. Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/audit.h3
-rw-r--r--include/linux/tty.h6
2 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h
index b26d7f121ac5..a3a50cca1efb 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -441,8 +441,7 @@ extern int audit_update_lsm_rules(void);
441extern int audit_filter_user(int type); 441extern int audit_filter_user(int type);
442extern int audit_filter_type(int type); 442extern int audit_filter_type(int type);
443extern int audit_receive_filter(int type, int pid, int seq, 443extern int audit_receive_filter(int type, int pid, int seq,
444 void *data, size_t datasz, kuid_t loginuid, 444 void *data, size_t datasz);
445 u32 sessionid, u32 sid);
446extern int audit_enabled; 445extern int audit_enabled;
447#else /* CONFIG_AUDIT */ 446#else /* CONFIG_AUDIT */
448static inline __printf(4, 5) 447static inline __printf(4, 5)
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 8db1b569c37a..78e378b3971c 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -517,8 +517,7 @@ extern void tty_audit_exit(void);
517extern void tty_audit_fork(struct signal_struct *sig); 517extern void tty_audit_fork(struct signal_struct *sig);
518extern void tty_audit_tiocsti(struct tty_struct *tty, char ch); 518extern void tty_audit_tiocsti(struct tty_struct *tty, char ch);
519extern void tty_audit_push(struct tty_struct *tty); 519extern void tty_audit_push(struct tty_struct *tty);
520extern int tty_audit_push_task(struct task_struct *tsk, 520extern int tty_audit_push_task(struct task_struct *tsk);
521 kuid_t loginuid, u32 sessionid);
522#else 521#else
523static inline void tty_audit_add_data(struct tty_struct *tty, 522static inline void tty_audit_add_data(struct tty_struct *tty,
524 unsigned char *data, size_t size, unsigned icanon) 523 unsigned char *data, size_t size, unsigned icanon)
@@ -536,8 +535,7 @@ static inline void tty_audit_fork(struct signal_struct *sig)
536static inline void tty_audit_push(struct tty_struct *tty) 535static inline void tty_audit_push(struct tty_struct *tty)
537{ 536{
538} 537}
539static inline int tty_audit_push_task(struct task_struct *tsk, 538static inline int tty_audit_push_task(struct task_struct *tsk)
540 kuid_t loginuid, u32 sessionid)
541{ 539{
542 return 0; 540 return 0;
543} 541}