summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-cavium/CVE-2017-7487.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-cavium/CVE-2017-7487.patch')
-rw-r--r--recipes-kernel/linux/linux-cavium/CVE-2017-7487.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/recipes-kernel/linux/linux-cavium/CVE-2017-7487.patch b/recipes-kernel/linux/linux-cavium/CVE-2017-7487.patch
deleted file mode 100644
index 41849fe..0000000
--- a/recipes-kernel/linux/linux-cavium/CVE-2017-7487.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From ee0d8d8482345ff97a75a7d747efc309f13b0d80 Mon Sep 17 00:00:00 2001
2From: Dan Carpenter <dan.carpenter@oracle.com>
3Date: Tue, 2 May 2017 13:58:53 +0300
4Subject: [PATCH] ipx: call ipxitf_put() in ioctl error path
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9We should call ipxitf_put() if the copy_to_user() fails.
10
11CVE: CVE-2017-7487
12Upstream-Status: Backport [backport from: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=v4.9.50&id=820adccd0e3be9bdd2384ca8fc4712108cfdf28b]
13
14Reported-by: 李强 <liqiang6-s@360.cn>
15Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
16Signed-off-by: David S. Miller <davem@davemloft.net>
17Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
18---
19 net/ipx/af_ipx.c | 5 ++---
20 1 file changed, 2 insertions(+), 3 deletions(-)
21
22diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
23index 8a9219ff2e77e..fa31ef29e3fa0 100644
24--- a/net/ipx/af_ipx.c
25+++ b/net/ipx/af_ipx.c
26@@ -1168,11 +1168,10 @@ static int ipxitf_ioctl(unsigned int cmd, void __user *arg)
27 sipx->sipx_network = ipxif->if_netnum;
28 memcpy(sipx->sipx_node, ipxif->if_node,
29 sizeof(sipx->sipx_node));
30- rc = -EFAULT;
31+ rc = 0;
32 if (copy_to_user(arg, &ifr, sizeof(ifr)))
33- break;
34+ rc = -EFAULT;
35 ipxitf_put(ipxif);
36- rc = 0;
37 break;
38 }
39 case SIOCAIPXITFCRT: