[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1365335522-29931-5-git-send-email-minipli@googlemail.com>
Date: Sun, 7 Apr 2013 13:51:50 +0200
From: Mathias Krause <minipli@...glemail.com>
To: "David S. Miller" <davem@...emloft.net>
Cc: netdev@...r.kernel.org,
Allan Stephens <allan.stephens@...driver.com>,
Aloisio Almeida Jr <aloisio.almeida@...nbossa.org>,
Andy King <acking@...are.com>,
Arnaldo Carvalho de Melo <acme@...stprotocols.net>,
Dmitry Torokhov <dtor@...are.com>,
George Zhang <georgezhang@...are.com>,
Gustavo Padovan <gustavo@...ovan.org>,
Johan Hedberg <johan.hedberg@...il.com>,
Jon Maloy <jon.maloy@...csson.com>,
Lauro Ramos Venancio <lauro.venancio@...nbossa.org>,
Marcel Holtmann <marcel@...tmann.org>,
Ralf Baechle <ralf@...ux-mips.org>,
Samuel Ortiz <sameo@...ux.intel.com>,
Samuel Ortiz <samuel@...tiz.org>,
Sjur Braendeland <sjur.brandeland@...ricsson.com>,
Ursula Braun <ursula.braun@...ibm.com>,
Brad Spengler <spender@...ecurity.net>,
Mathias Krause <minipli@...glemail.com>
Subject: [PATCH 04/16] Bluetooth: RFCOMM - Fix missing msg_namelen update in rfcomm_sock_recvmsg()
If RFCOMM_DEFER_SETUP is set in the flags, rfcomm_sock_recvmsg() returns
early with 0 without updating the possibly set msg_namelen member. This,
in turn, leads to a 128 byte kernel stack leak in net/socket.c.
Fix this by updating msg_namelen in this case. For all other cases it
will be handled in bt_sock_stream_recvmsg().
Cc: Marcel Holtmann <marcel@...tmann.org>
Cc: Gustavo Padovan <gustavo@...ovan.org>
Cc: Johan Hedberg <johan.hedberg@...il.com>
Signed-off-by: Mathias Krause <minipli@...glemail.com>
---
net/bluetooth/rfcomm/sock.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index c23bae8..7c9224b 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -608,6 +608,7 @@ static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) {
rfcomm_dlc_accept(d);
+ msg->msg_namelen = 0;
return 0;
}
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists