diff options
| author | Tom Rini <[email protected]> | 2022-05-27 08:48:47 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-05-27 08:48:47 -0400 |
| commit | 0fdc468b069b09bf176fe0255f3ef88f88ef3be0 (patch) | |
| tree | 6d64f247c0585aab38adf27f6b164493f569cdef /net | |
| parent | 661f5400754750df4104b6466942c8b62897340d (diff) | |
| parent | d64ac8549d97cfc37bd629a60f0d502bcd3ee9c7 (diff) | |
Merge branch '2022-05-26-assorted-fixes'
- Fixes for pytest timeout in CI, missing dependency on PCI for the
e1000 driver, fix for CVE-2022-30767 (NFS), TI K3 AM642 DTS bugfix,
MAINTAINERS updates, mksquashfs version check fix.
Diffstat (limited to 'net')
| -rw-r--r-- | net/nfs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/nfs.c b/net/nfs.c index 3c01cebd96f..9152ab742ef 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -52,7 +52,7 @@ static const ulong nfs_timeout = CONFIG_NFS_TIMEOUT; static char dirfh[NFS_FHSIZE]; /* NFSv2 / NFSv3 file handle of directory */ static char filefh[NFS3_FHSIZE]; /* NFSv2 / NFSv3 file handle */ -static int filefh3_length; /* (variable) length of filefh when NFSv3 */ +static unsigned int filefh3_length; /* (variable) length of filefh when NFSv3 */ static enum net_loop_state nfs_download_state; static struct in_addr nfs_server_ip; @@ -573,8 +573,6 @@ static int nfs_lookup_reply(uchar *pkt, unsigned len) 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); } |