diff options
author | Kangjie Lu <kangjielu@gmail.com> | 2016-05-08 19:10:14 +0300 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2016-05-19 12:00:13 +0300 |
commit | aeb14f1738e3c6a703213cb103e0f89f143bd276 (patch) | |
tree | af0445e1fccf89496758dd29a7789691a224383a | |
parent | cf5ae3f3cf73cf5112e1912d9d0d2dedcbf15e08 (diff) | |
download | linux-aeb14f1738e3c6a703213cb103e0f89f143bd276.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: Jiri Slaby <jslaby@suse.cz>
-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 b8253250d723..c42bf2b8ec4f 100644 --- a/net/x25/x25_facilities.c +++ b/net/x25/x25_facilities.c @@ -275,6 +275,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) |