diff options
-rw-r--r-- | recipes-kernel/linux/files/CVE-2016-4951.patch | 43 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto_4.%.bbappend | 1 |
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..31eb29e --- /dev/null +++ b/recipes-kernel/linux/files/CVE-2016-4951.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 23cdd8c3cbe9d790f23d7f9ae14e9b828f56f69c Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Alpe <richard.alpe@ericsson.com> | ||
3 | Date: Mon, 16 May 2016 11:14:54 +0200 | ||
4 | Subject: tipc: check nl sock before parsing nested attributes | ||
5 | |||
6 | [ Upstream commit 45e093ae2830cd1264677d47ff9a95a71f5d9f9c ] | ||
7 | |||
8 | Make sure the socket for which the user is listing publication exists | ||
9 | before parsing the socket netlink attributes. | ||
10 | |||
11 | Prior to this patch a call without any socket caused a NULL pointer | ||
12 | dereference in tipc_nl_publ_dump(). | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | CVE: CVE-2016-4951 | ||
16 | |||
17 | Tested-and-reported-by: Baozeng Ding <sploving1@gmail.com> | ||
18 | Signed-off-by: Richard Alpe <richard.alpe@ericsson.com> | ||
19 | Acked-by: Jon Maloy <jon.maloy@ericsson.cm> | ||
20 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
22 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
23 | --- | ||
24 | net/tipc/socket.c | 3 +++ | ||
25 | 1 file changed, 3 insertions(+) | ||
26 | |||
27 | diff --git a/net/tipc/socket.c b/net/tipc/socket.c | ||
28 | index e53003c..9b713e0 100644 | ||
29 | --- a/net/tipc/socket.c | ||
30 | +++ b/net/tipc/socket.c | ||
31 | @@ -2814,6 +2814,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 | -- | ||
42 | cgit v0.12 | ||
43 | |||
diff --git a/recipes-kernel/linux/linux-yocto_4.%.bbappend b/recipes-kernel/linux/linux-yocto_4.%.bbappend index d0c4e98..cd0de11 100644 --- a/recipes-kernel/linux/linux-yocto_4.%.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.%.bbappend | |||
@@ -5,6 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | |||
5 | SRC_URI += "file://hid-CVE-2016-5829.patch \ | 5 | SRC_URI += "file://hid-CVE-2016-5829.patch \ |
6 | file://CVE-2016-5696-limiting-of-all-challenge.patch \ | 6 | file://CVE-2016-5696-limiting-of-all-challenge.patch \ |
7 | file://CVE-2016-5696-make-challenge-acks-less-predictable.patch \ | 7 | file://CVE-2016-5696-make-challenge-acks-less-predictable.patch \ |
8 | file://CVE-2016-4951.patch \ | ||
8 | " | 9 | " |
9 | 10 | ||
10 | ENEA_KERNEL_FRAGMENTS += "\ | 11 | ENEA_KERNEL_FRAGMENTS += "\ |