summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Sarmadi <sona.sarmadi@enea.com>2016-10-10 09:43:17 +0200
committerMartin Borg <martin.borg@enea.com>2016-10-11 10:26:09 +0200
commit05ab1225e55cdb2674b00e04d5aa08f052575acc (patch)
tree4d0d9e725ffea41ddd46dd21e1bdc7af1bd6c8b2
parenta5e25abb287d52a7e4f4be4037c522035d4c9587 (diff)
downloadmeta-enea-bsp-ppc-05ab1225e55cdb2674b00e04d5aa08f052575acc.tar.gz
kernel: CVE-2016-4951
Fixes null pointer dereference in tipc_nl_publ_dump. References: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-4951 Reference to upstream fix: https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/patch/?id=49956430d3d55b47e4a2d2f5f777d641cae137d6 Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> Signed-off-by: Martin Borg <martin.borg@enea.com>
-rw-r--r--recipes-kernel/linux/files/CVE-2016-4951.patch43
-rw-r--r--recipes-kernel/linux/linux-qoriq_4.1.bbappend1
2 files changed, 44 insertions, 0 deletions
diff --git a/recipes-kernel/linux/files/CVE-2016-4951.patch b/recipes-kernel/linux/files/CVE-2016-4951.patch
new file mode 100644
index 0000000..e4807b3
--- /dev/null
+++ b/recipes-kernel/linux/files/CVE-2016-4951.patch
@@ -0,0 +1,43 @@
1From 49956430d3d55b47e4a2d2f5f777d641cae137d6 Mon Sep 17 00:00:00 2001
2From: Richard Alpe <richard.alpe@ericsson.com>
3Date: Mon, 16 May 2016 11:14:54 +0200
4Subject: tipc: check nl sock before parsing nested attributes
5
6[ Upstream commit 45e093ae2830cd1264677d47ff9a95a71f5d9f9c ]
7
8Make sure the socket for which the user is listing publication exists
9before parsing the socket netlink attributes.
10
11Prior to this patch a call without any socket caused a NULL pointer
12dereference in tipc_nl_publ_dump().
13
14Upstream-Status: Backport
15CVE: CVE-2016-4951
16
17Tested-and-reported-by: Baozeng Ding <sploving1@gmail.com>
18Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
19Acked-by: Jon Maloy <jon.maloy@ericsson.cm>
20Signed-off-by: David S. Miller <davem@davemloft.net>
21Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
22Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
23---
24 net/tipc/socket.c | 3 +++
25 1 file changed, 3 insertions(+)
26
27diff --git a/net/tipc/socket.c b/net/tipc/socket.c
28index 20cc6df..d41d424 100644
29--- a/net/tipc/socket.c
30+++ b/net/tipc/socket.c
31@@ -2804,6 +2804,9 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb)
32 if (err)
33 return err;
34
35+ if (!attrs[TIPC_NLA_SOCK])
36+ return -EINVAL;
37+
38 err = nla_parse_nested(sock, TIPC_NLA_SOCK_MAX,
39 attrs[TIPC_NLA_SOCK],
40 tipc_nl_sock_policy);
41--
42cgit v0.12
43
diff --git a/recipes-kernel/linux/linux-qoriq_4.1.bbappend b/recipes-kernel/linux/linux-qoriq_4.1.bbappend
index 17b288a..39e23cb 100644
--- a/recipes-kernel/linux/linux-qoriq_4.1.bbappend
+++ b/recipes-kernel/linux/linux-qoriq_4.1.bbappend
@@ -3,4 +3,5 @@ require recipes-kernel/linux/linux-qoriq-common.inc
3FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 3FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
4 4
5SRC_URI += "file://hid-CVE-2016-5829.patch \ 5SRC_URI += "file://hid-CVE-2016-5829.patch \
6 file://CVE-2016-4951.patch \
6 " 7 "