Skip to content

Commit ef1d8dd

Browse files
committed
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()
2 parents 8ab7745 + c0019b7 commit ef1d8dd

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

fs/nfsd/nfs4xdr.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,8 @@ nfsd4_decode_bitmap4(struct nfsd4_compoundargs *argp, u32 *bmval, u32 bmlen)
288288
p = xdr_inline_decode(argp->xdr, count << 2);
289289
if (!p)
290290
return nfserr_bad_xdr;
291-
i = 0;
292-
while (i < count)
293-
bmval[i++] = be32_to_cpup(p++);
294-
while (i < bmlen)
295-
bmval[i++] = 0;
291+
for (i = 0; i < bmlen; i++)
292+
bmval[i] = (i < count) ? be32_to_cpup(p++) : 0;
296293

297294
return nfs_ok;
298295
}

0 commit comments

Comments
 (0)