summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorliucheng (G) <liucheng32@huawei.com>2019-08-29 13:48:02 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2019-09-04 11:37:19 -0500
commit5d14ee4e53a81055d34ba280cb8fd90330f22a96 (patch)
treed38ed9d6724fd99924f1377fec64f930bbc2c452 /net
parentcf3a4f1e86ecdd24f87b615051b49d8e1968c230 (diff)
downloadu-boot-5d14ee4e53a81055d34ba280cb8fd90330f22a96.tar.gz
CVE-2019-14196: nfs: fix unbounded memcpy with a failed length check at nfs_lookup_reply
This patch adds a check to rpc_pkt.u.reply.data at nfs_lookup_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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/nfs.c b/net/nfs.c
index 915acd95cf..89952aeb66 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -566,11 +566,15 @@ static int nfs_lookup_reply(uchar *pkt, unsigned len)
}
if (supported_nfs_versions & NFSV2_FLAG) {
+ if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + NFS_FHSIZE) > len)
+ return -NFS_RPC_DROP;
memcpy(filefh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE);
} else { /* NFSV3_FLAG */
filefh3_length = ntohl(rpc_pkt.u.reply.data[1]);
if (filefh3_length > NFS3_FHSIZE)
filefh3_length = NFS3_FHSIZE;
+ if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + filefh3_length) > len)
+ return -NFS_RPC_DROP;
memcpy(filefh, rpc_pkt.u.reply.data + 2, filefh3_length);
}