summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2012-08-15 15:31:50 +0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2014-02-11 01:11:17 +0400
commit8ad4a5c58c7192de527ff2fd818fc362eb270013 (patch)
tree0d6f68977daa0be405020f9559769ba65bc973b9
parentd1b1f8bc674b942c4ed1ec324260cb81dfd60801 (diff)
downloadlinux-8ad4a5c58c7192de527ff2fd818fc362eb270013.tar.xz
Bluetooth: RFCOMM - Fix info leak via getsockname()
commit 9344a972961d1a6d2c04d9008b13617bcb6ec2ef upstream. The RFCOMM code fails to initialize the trailing padding byte of struct sockaddr_rc added for alignment. It that for leaks one byte kernel stack via the getsockname() syscall. Add an explicit memset(0) before filling the structure to avoid the info leak. Signed-off-by: Mathias Krause <minipli@googlemail.com> Cc: Marcel Holtmann <marcel@holtmann.org> Cc: Gustavo Padovan <gustavo@padovan.org> Cc: Johan Hedberg <johan.hedberg@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--net/bluetooth/rfcomm/sock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index b045bbbc2353..92aa7a012110 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -547,6 +547,7 @@ static int rfcomm_sock_getname(struct socket *sock, struct sockaddr *addr, int *
BT_DBG("sock %p, sk %p", sock, sk);
+ memset(sa, 0, sizeof(*sa));
sa->rc_family = AF_BLUETOOTH;
sa->rc_channel = rfcomm_pi(sk)->channel;
if (peer)