diff options
author | Kangjie Lu <kangjielu@gmail.com> | 2016-05-08 19:10:14 +0300 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-12 15:48:16 +0300 |
commit | b35237a8295196b3ea3efb36fde887b7b4dffb9a (patch) | |
tree | e3237a57b10510bf752a21862f6b5a6a2040b7fb /net/x25 | |
parent | f7eadcefc08424765cad28feddd6659e05c1b2c8 (diff) | |
download | linux-b35237a8295196b3ea3efb36fde887b7b4dffb9a.tar.xz |
net: fix a kernel infoleak in x25 module
[ Upstream commit 79e48650320e6fba48369fccf13fd045315b19b8 ]
Stack object "dte_facilities" is allocated in x25_rx_call_request(),
which is supposed to be initialized in x25_negotiate_facilities.
However, 5 fields (8 bytes in total) are not initialized. This
object is then copied to userland via copy_to_user, thus infoleak
occurs.
Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net/x25')
-rw-r--r-- | net/x25/x25_facilities.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/x25/x25_facilities.c b/net/x25/x25_facilities.c index 7ecd04c21360..997ff7b2509b 100644 --- a/net/x25/x25_facilities.c +++ b/net/x25/x25_facilities.c @@ -277,6 +277,7 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk, memset(&theirs, 0, sizeof(theirs)); memcpy(new, ours, sizeof(*new)); + memset(dte, 0, sizeof(*dte)); len = x25_parse_facilities(skb, &theirs, dte, &x25->vc_facil_mask); if (len < 0) |