aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2012-08-15 07:31:48 -0400
committerDavid S. Miller <davem@davemloft.net>2012-08-16 00:36:30 -0400
commit9ad2de43f1aee7e7274a4e0d41465489299e344b (patch)
treeb8eadec4216bad623c89e9079133720275355597 /net
parent3f68ba07b1da811bf383b4b701b129bfcb2e4988 (diff)
Bluetooth: RFCOMM - Fix info leak in getsockopt(BT_SECURITY)
The RFCOMM code fails to initialize the key_size member of struct bt_security before copying it to userland -- that for leaking one byte kernel stack. Initialize key_size with 0 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>
Diffstat (limited to 'net')
-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 7e1e59645c05..64f55ca61472 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -822,6 +822,7 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
822 } 822 }
823 823
824 sec.level = rfcomm_pi(sk)->sec_level; 824 sec.level = rfcomm_pi(sk)->sec_level;
825 sec.key_size = 0;
825 826
826 len = min_t(unsigned int, len, sizeof(sec)); 827 len = min_t(unsigned int, len, sizeof(sec));
827 if (copy_to_user(optval, (char *) &sec, len)) 828 if (copy_to_user(optval, (char *) &sec, len))