public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, GeneBlue <geneblue.mail@gmail.com>,
	Cong Wang <xiyou.wangcong@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Manfred Spraul <manfred@colorfullife.com>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 4.9 01/25] mqueue: fix a use-after-free in sys_mq_notify()
Date: Thu, 13 Jul 2017 17:40:15 +0200	[thread overview]
Message-ID: <20170713154001.649331801@linuxfoundation.org> (raw)
In-Reply-To: <20170713154001.535209166@linuxfoundation.org>

4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Cong Wang <xiyou.wangcong@gmail.com>

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>

---
 ipc/mqueue.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1249,8 +1249,10 @@ retry:
 
 			timeo = MAX_SCHEDULE_TIMEOUT;
 			ret = netlink_attachskb(sock, nc, &timeo, NULL);
-			if (ret == 1)
+			if (ret == 1) {
+				sock = NULL;
 				goto retry;
+			}
 			if (ret) {
 				sock = NULL;
 				nc = NULL;

  reply	other threads:[~2017-07-13 15:41 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-13 15:40 [PATCH 4.9 00/25] 4.9.38-stable review Greg Kroah-Hartman
2017-07-13 15:40 ` Greg Kroah-Hartman [this message]
2017-07-13 15:40 ` [PATCH 4.9 02/25] Add "shutdown" to "struct class" Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 03/25] tpm: Issue a TPM2_Shutdown for TPM2 devices Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 04/25] tools include: Add a __fallthrough statement Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 05/25] tools string: Use __fallthrough in perf_atoll() Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 06/25] tools strfilter: Use __fallthrough Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 07/25] perf top: " Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 08/25] perf thread_map: Correctly size buffer used with dirent->dt_name Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 09/25] perf intel-pt: Use __fallthrough Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 10/25] perf tests: Avoid possible truncation with dirent->d_name + snprintf Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 11/25] perf bench numa: Avoid possible truncation when using snprintf() Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 12/25] perf header: Fix handling of PERF_EVENT_UPDATE__SCALE Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 13/25] perf scripting perl: Fix compile error with some perl5 versions Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 14/25] perf probe: Fix to probe on gcc generated symbols for offline kernel Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 15/25] perf probe: Add error checks to offline probe post-processing Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 16/25] md: fix incorrect use of lexx_to_cpu in does_sb_need_changing Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 17/25] md: fix super_offset endianness in super_1_rdev_size_change Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 18/25] locking/rwsem-spinlock: Fix EINTR branch in __down_write_common() Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 19/25] staging: vt6556: vnt_start Fix missing call to vnt_key_init_table Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 20/25] staging: comedi: fix clean-up of comedi_class in comedi_init() Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 23/25] ext4: check return value of kstrtoull correctly in reserved_clusters_store Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 24/25] x86/mm/pat: Dont report PAT on CPUs that dont support it Greg Kroah-Hartman
2017-07-13 15:40 ` [PATCH 4.9 25/25] [media] saa7134: fix warm Medion 7134 EEPROM read Greg Kroah-Hartman
2017-07-13 16:47 ` [PATCH 4.9 00/25] 4.9.38-stable review Sumit Semwal
2017-07-14  1:34 ` Guenter Roeck
     [not found] ` <5967dc72.7187df0a.f1fb5.37a1@mx.google.com>
2017-07-14  9:52   ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170713154001.649331801@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=geneblue.mail@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=manfred@colorfullife.com \
    --cc=stable@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=xiyou.wangcong@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox