diff options
author | Mathias Krause <minipli@googlemail.com> | 2012-08-15 11:31:50 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 10:29:36 -0700 |
commit | 8717cd3d63233ee5591bf8e8d6e5960a1f6252b1 (patch) | |
tree | ffc4c49e501cf875899afc531332fe6b87c4cfff /net/bluetooth | |
parent | 279d3f5b2d402034dee1a81b7f5e3f678aa46d21 (diff) | |
download | linux-3.10-8717cd3d63233ee5591bf8e8d6e5960a1f6252b1.tar.gz linux-3.10-8717cd3d63233ee5591bf8e8d6e5960a1f6252b1.tar.bz2 linux-3.10-8717cd3d63233ee5591bf8e8d6e5960a1f6252b1.zip |
Bluetooth: RFCOMM - Fix info leak via getsockname()
[ Upstream commit 9344a972961d1a6d2c04d9008b13617bcb6ec2ef ]
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index dfa3dd96106..717c43ac0c7 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -546,6 +546,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) |