diff options
| author | Mathias Krause <minipli@googlemail.com> | 2012-08-15 11:31:48 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 10:29:36 -0700 |
| commit | 745dcdb0fd330f0cc984bd8a7764a81f04e44780 (patch) | |
| tree | f0acac1ff978f33ebb9fa23bb470d18e375a30df /net/bluetooth | |
| parent | 639edee79eb2035b6fe3976f50a1c5364acc7352 (diff) | |
| download | linux-3.10-745dcdb0fd330f0cc984bd8a7764a81f04e44780.tar.gz linux-3.10-745dcdb0fd330f0cc984bd8a7764a81f04e44780.tar.bz2 linux-3.10-745dcdb0fd330f0cc984bd8a7764a81f04e44780.zip | |
Bluetooth: RFCOMM - Fix info leak in getsockopt(BT_SECURITY)
[ Upstream commit 9ad2de43f1aee7e7274a4e0d41465489299e344b ]
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>
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 a55a43e9f70..dfa3dd96106 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -836,6 +836,7 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c } sec.level = rfcomm_pi(sk)->sec_level; + sec.key_size = 0; len = min_t(unsigned int, len, sizeof(sec)); if (copy_to_user(optval, (char *) &sec, len)) |