diff options
| author |   Alistair Francis <alistair.francis@wdc.com> | 2019-10-14 17:43:16 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-15 16:57:27 +0100 |
| commit | 460f877adbfaf2ae980228c9d545886f82656c38 (patch) | |
| tree | 0eccb474caf9bad95a485a0600b782a0fa720a75 /meta/recipes-bsp/u-boot/files/0007-CVE-2019-14194-14198.patch | |
| parent | 927e16e289292d7bc4dad10d0ed722d8705fff48 (diff) | |
| download | openembedded-core-contrib-460f877adbfaf2ae980228c9d545886f82656c38.tar.gz | |
u-boot: Bump from 2019.07 to 2019.10
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot/files/0007-CVE-2019-14194-14198.patch')
| -rw-r--r-- | meta/recipes-bsp/u-boot/files/0007-CVE-2019-14194-14198.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-bsp/u-boot/files/0007-CVE-2019-14194-14198.patch b/meta/recipes-bsp/u-boot/files/0007-CVE-2019-14194-14198.patch deleted file mode 100644 index b3e3b72ebf..0000000000 --- a/meta/recipes-bsp/u-boot/files/0007-CVE-2019-14194-14198.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fb6dc193bf2685b7574b218f7ca558aa54659e11 Mon Sep 17 00:00:00 2001 -From: "liucheng (G)" <liucheng32@huawei.com> -Date: Thu, 29 Aug 2019 13:47:48 +0000 -Subject: [PATCH 7/9] CVE-2019-14194/CVE-2019-14198: nfs: fix unbounded memcpy - with a failed length check at nfs_read_reply -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This patch adds a check to rpc_pkt.u.reply.data at nfs_read_reply. - -Signed-off-by: Cheng Liu <liucheng32@huawei.com> -Reported-by: FermÃn Serna <fermin@semmle.com> -Acked-by: Joe Hershberger <joe.hershberger@ni.com> - -Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit; - h=aa207cf3a6d68f39d64cd29057a4fb63943e9078] - -CVE: CVE-2019-14194 and CVE-2019-14198 - -Signed-off-by: Meng Li <Meng.Li@windriver.com> ---- - net/nfs.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/net/nfs.c b/net/nfs.c -index b7cf3b3a18..11941fad1a 100644 ---- a/net/nfs.c -+++ b/net/nfs.c -@@ -701,6 +701,9 @@ static int nfs_read_reply(uchar *pkt, unsigned len) - &(rpc_pkt.u.reply.data[4 + nfsv3_data_offset]); - } - -+ if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + rlen) > len) -+ return -9999; -+ - if (store_block(data_ptr, nfs_offset, rlen)) - return -9999; - --- -2.17.1 - |