Commit 034e10b4 authored by Cong Wang's avatar Cong Wang Committed by Greg Kroah-Hartman

mqueue: fix a use-after-free in sys_mq_notify()

commit f991af3d upstream.

The retry logic for netlink_attachskb() inside sys_mq_notify()
is nasty and vulnerable:

1) The sock refcnt is already released when retry is needed
2) The fd is controllable by user-space because we already
   release the file refcnt

so we when retry but the fd has been just closed by user-space
during this small window, we end up calling netlink_detachskb()
on the error path which releases the sock again, later when
the user-space closes this socket a use-after-free could be
triggered.

Setting 'sock' to NULL here should be sufficient to fix it.
Reported-by: default avatarGeneBlue <geneblue.mail@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5fd2bba0
...@@ -1251,8 +1251,10 @@ SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes, ...@@ -1251,8 +1251,10 @@ SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes,
timeo = MAX_SCHEDULE_TIMEOUT; timeo = MAX_SCHEDULE_TIMEOUT;
ret = netlink_attachskb(sock, nc, &timeo, NULL); ret = netlink_attachskb(sock, nc, &timeo, NULL);
if (ret == 1) if (ret == 1) {
sock = NULL;
goto retry; goto retry;
}
if (ret) { if (ret) {
sock = NULL; sock = NULL;
nc = NULL; nc = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment