aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorliucheng (G) <liucheng32@huawei.com>2019-08-29 13:47:48 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2019-09-04 11:37:19 -0500
commitaa207cf3a6d68f39d64cd29057a4fb63943e9078 (patch)
tree25c1197dff0ca99de4c920efac3e92cf2e955245 /net
parent741a8a08ebe5bc3ccfe3cde6c2b44ee53891af21 (diff)
downloadu-boot-aa207cf3a6d68f39d64cd29057a4fb63943e9078.zip
u-boot-aa207cf3a6d68f39d64cd29057a4fb63943e9078.tar.gz
u-boot-aa207cf3a6d68f39d64cd29057a4fb63943e9078.tar.bz2
CVE-2019-14194/CVE-2019-14198: nfs: fix unbounded memcpy with a failed length check at nfs_read_reply
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>
Diffstat (limited to 'net')
-rw-r--r--net/nfs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/nfs.c b/net/nfs.c
index b7cf3b3..11941fa 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;