renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-01 18:04:07 +08:00
Code

audit: use spin_lock in audit_receive_msg to process tty logging

Browse Source 
This function is called when we receive a netlink message from
userspace.  We don't need to worry about it coming from irq context or
irqs making it re-entrant.

Signed-off-by: Eric Paris <eparis@redhat.com>
This commit is contained in:
Eric Paris 2013-04-30 11:28:04 -04:00
parent bee0a224e7
commit 7173c54e3a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/audit.c
View File

@ -805,12 +805,11 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
case AUDIT_TTY_GET: { case AUDIT_TTY_GET: {
struct audit_tty_status s; struct audit_tty_status s;
struct task_struct *tsk = current; struct task_struct *tsk = current;
unsigned long flags;
spin_lock_irqsave(&tsk->sighand->siglock, flags); spin_lock(&tsk->sighand->siglock);
s.enabled = tsk->signal->audit_tty != 0; s.enabled = tsk->signal->audit_tty != 0;
s.log_passwd = tsk->signal->audit_tty_log_passwd; s.log_passwd = tsk->signal->audit_tty_log_passwd;
spin_unlock_irqrestore(&tsk->sighand->siglock, flags); spin_unlock(&tsk->sighand->siglock);
audit_send_reply(NETLINK_CB(skb).portid, seq, audit_send_reply(NETLINK_CB(skb).portid, seq,
AUDIT_TTY_GET, 0, 0, &s, sizeof(s)); AUDIT_TTY_GET, 0, 0, &s, sizeof(s));
@ -819,7 +818,6 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
case AUDIT_TTY_SET: { case AUDIT_TTY_SET: {
struct audit_tty_status s; struct audit_tty_status s;
struct task_struct *tsk = current; struct task_struct *tsk = current;
unsigned long flags;
memset(&s, 0, sizeof(s)); memset(&s, 0, sizeof(s));
/* guard against past and future API changes */ /* guard against past and future API changes */
@ -828,10 +826,10 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
(s.log_passwd != 0 && s.log_passwd != 1)) (s.log_passwd != 0 && s.log_passwd != 1))
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&tsk->sighand->siglock, flags); spin_lock(&tsk->sighand->siglock);
tsk->signal->audit_tty = s.enabled; tsk->signal->audit_tty = s.enabled;
tsk->signal->audit_tty_log_passwd = s.log_passwd; tsk->signal->audit_tty_log_passwd = s.log_passwd;
spin_unlock_irqrestore(&tsk->sighand->siglock, flags); spin_unlock(&tsk->sighand->siglock);
break; break;
} }
default: default: