diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-05-05 08:45:43 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-05-05 08:51:54 -0400 |
commit | a26d52b3e962286a663a9b8c50eddfa79da40ae2 (patch) | |
tree | ee37119a3a6d20bbbb60cc49589d48ca9b546f74 /net-fix-infoleak-in-llc.patch | |
parent | ba418dcee240f750a17628c2e164554973603858 (diff) | |
download | kernel-a26d52b3e962286a663a9b8c50eddfa79da40ae2.tar.gz kernel-a26d52b3e962286a663a9b8c50eddfa79da40ae2.tar.xz kernel-a26d52b3e962286a663a9b8c50eddfa79da40ae2.zip |
CVE-2016-4486 CVE-2016-4485 info leaks (rhbz 1333316 1333309 1333321)
Diffstat (limited to 'net-fix-infoleak-in-llc.patch')
-rw-r--r-- | net-fix-infoleak-in-llc.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/net-fix-infoleak-in-llc.patch b/net-fix-infoleak-in-llc.patch new file mode 100644 index 000000000..38f0d506a --- /dev/null +++ b/net-fix-infoleak-in-llc.patch @@ -0,0 +1,32 @@ +From ec0de35ded8c4a8588290a1b442aa3aa4bdf4de1 Mon Sep 17 00:00:00 2001 +From: Kangjie Lu <kangjielu@gmail.com> +Date: Tue, 3 May 2016 16:35:05 -0400 +Subject: [PATCH 2/2] net: fix infoleak in llc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The stack object “info” has a total size of 12 bytes. Its last byte +is padding which is not initialized and leaked via “put_cmsg”. + +Signed-off-by: Kangjie Lu <kjlu@gatech.edu> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/llc/af_llc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c +index b3c52e3f689a..8ae3ed97d95c 100644 +--- a/net/llc/af_llc.c ++++ b/net/llc/af_llc.c +@@ -626,6 +626,7 @@ static void llc_cmsg_rcv(struct msghdr *msg, struct sk_buff *skb) + if (llc->cmsg_flags & LLC_CMSG_PKTINFO) { + struct llc_pktinfo info; + ++ memset(&info, 0, sizeof(info)); + info.lpi_ifindex = llc_sk(skb->sk)->dev->ifindex; + llc_pdu_decode_dsap(skb, &info.lpi_sap); + llc_pdu_decode_da(skb, info.lpi_mac); +-- +2.5.5 + |