aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'nfsd-5.16-1' of git://linux-nfs.org/~bfields/linux

Browse Source 
Pull nfsd bugfix from Bruce Fields:
 "This is just one bugfix for a buffer overflow in knfsd's xdr decoding"

* tag 'nfsd-5.16-1' of git://linux-nfs.org/~bfields/linux:
  NFSD: Fix exposure in nfsd4_decode_bitmap()
This commit is contained in:
Linus Torvalds
2021-11-17 08:38:00 -08:00
parent 8ab7745879 c0019b7db1
commit ef1d8dda23
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfsd/nfs4xdr.c
View File

@@ -288,11 +288,8 @@ nfsd4_decode_bitmap4(struct nfsd4_compoundargs *argp, u32 *bmval, u32 bmlen)
p = xdr_inline_decode(argp->xdr, count << 2); p = xdr_inline_decode(argp->xdr, count << 2);
if (!p) if (!p)
return nfserr_bad_xdr; return nfserr_bad_xdr;
i = 0; for (i = 0; i < bmlen; i++)
while (i < count) bmval[i] = (i < count) ? be32_to_cpup(p++) : 0;
bmval[i++] = be32_to_cpup(p++);
while (i < bmlen)
bmval[i++] = 0;
return nfs_ok; return nfs_ok;
} }