]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
SELinux: hold tasklist_lock and siglock while waking wait_chldexit
authorEric Paris <eparis@redhat.com>
Tue, 4 Nov 2008 20:18:26 +0000 (15:18 -0500)
committerJames Morris <jmorris@namei.org>
Tue, 4 Nov 2008 21:44:11 +0000 (08:44 +1100)
SELinux has long been calling wake_up_interruptible() on
current->parent->signal->wait_chldexit without holding any locks.  It
appears that this operation should hold the tasklist_lock to dereference
current->parent and we should hold the siglock when waking up the
signal->wait_chldexit.

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
security/selinux/hooks.c

index 03ff7db2a2ca4d816c631dd34958eda7396a711e..5f21a514f5811332bc2e2dcc0db98dd0a0e0fdfd 100644 (file)
@@ -2268,7 +2268,9 @@ static void selinux_bprm_post_apply_creds(struct linux_binprm *bprm)
        struct rlimit *rlim, *initrlim;
        struct itimerval itimer;
        struct bprm_security_struct *bsec;
+       struct sighand_struct *psig;
        int rc, i;
+       unsigned long flags;
 
        tsec = current->security;
        bsec = bprm->security;
@@ -2335,7 +2337,12 @@ static void selinux_bprm_post_apply_creds(struct linux_binprm *bprm)
 
        /* Wake up the parent if it is waiting so that it can
           recheck wait permission to the new task SID. */
+       read_lock_irq(&tasklist_lock);
+       psig = current->parent->sighand;
+       spin_lock_irqsave(&psig->siglock, flags);
        wake_up_interruptible(&current->parent->signal->wait_chldexit);
+       spin_unlock_irqrestore(&psig->siglock, flags);
+       read_unlock_irq(&tasklist_lock);
 }
 
 /* superblock security operations */