summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot/files/0009-CVE-2019-14196.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/u-boot/files/0009-CVE-2019-14196.patch')
-rw-r--r--meta/recipes-bsp/u-boot/files/0009-CVE-2019-14196.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/meta/recipes-bsp/u-boot/files/0009-CVE-2019-14196.patch b/meta/recipes-bsp/u-boot/files/0009-CVE-2019-14196.patch
deleted file mode 100644
index f06e025297..0000000000
--- a/meta/recipes-bsp/u-boot/files/0009-CVE-2019-14196.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 74c468caa95c86cdb12c4b8073e154c435ac0bf7 Mon Sep 17 00:00:00 2001
2From: "liucheng (G)" <liucheng32@huawei.com>
3Date: Thu, 29 Aug 2019 13:48:02 +0000
4Subject: [PATCH 9/9] CVE-2019-14196: nfs: fix unbounded memcpy with a failed
5 length check at nfs_lookup_reply
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10This patch adds a check to rpc_pkt.u.reply.data at nfs_lookup_reply.
11
12Signed-off-by: Cheng Liu <liucheng32@huawei.com>
13Reported-by: Fermín Serna <fermin@semmle.com>
14Acked-by: Joe Hershberger <joe.hershberger@ni.com>
15
16Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit;
17 h=5d14ee4e53a81055d34ba280cb8fd90330f22a96]
18
19CVE: CVE-2019-14196
20
21Signed-off-by: Meng Li <Meng.Li@windriver.com>
22---
23 net/nfs.c | 4 ++++
24 1 file changed, 4 insertions(+)
25
26diff --git a/net/nfs.c b/net/nfs.c
27index 915acd95cf..89952aeb66 100644
28--- a/net/nfs.c
29+++ b/net/nfs.c
30@@ -566,11 +566,15 @@ static int nfs_lookup_reply(uchar *pkt, unsigned len)
31 }
32
33 if (supported_nfs_versions & NFSV2_FLAG) {
34+ if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + NFS_FHSIZE) > len)
35+ return -NFS_RPC_DROP;
36 memcpy(filefh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE);
37 } else { /* NFSV3_FLAG */
38 filefh3_length = ntohl(rpc_pkt.u.reply.data[1]);
39 if (filefh3_length > NFS3_FHSIZE)
40 filefh3_length = NFS3_FHSIZE;
41+ if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + filefh3_length) > len)
42+ return -NFS_RPC_DROP;
43 memcpy(filefh, rpc_pkt.u.reply.data + 2, filefh3_length);
44 }
45
46--
472.17.1
48