Skip to content

Commit 034e10b

Browse files
congwanggregkh
authored andcommitted
mqueue: fix a use-after-free in sys_mq_notify()
commit f991af3daabaecff34684fd51fac80319d1baad1 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: GeneBlue <geneblue.mail@gmail.com> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Manfred Spraul <manfred@colorfullife.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5fd2bba commit 034e10b

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

ipc/mqueue.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1251,8 +1251,10 @@ SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes,
12511251

12521252
timeo = MAX_SCHEDULE_TIMEOUT;
12531253
ret = netlink_attachskb(sock, nc, &timeo, NULL);
1254-
if (ret == 1)
1254+
if (ret == 1) {
1255+
sock = NULL;
12551256
goto retry;
1257+
}
12561258
if (ret) {
12571259
sock = NULL;
12581260
nc = NULL;

0 commit comments

Comments
 (0)