Commit ef1d8dda authored by Linus Torvalds's avatar Linus Torvalds

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

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()
parents 8ab77458 c0019b7d
...@@ -288,11 +288,8 @@ nfsd4_decode_bitmap4(struct nfsd4_compoundargs *argp, u32 *bmval, u32 bmlen) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment