mirror of
https://github.com/torvalds/linux
synced 2024-09-16 00:58:07 +00:00
nfsd-6.9 fixes:
- Avoid freeing unallocated memory (v6.7 regression) -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEKLLlsBKG3yQ88j7+M2qzM29mf5cFAmYv/dwACgkQM2qzM29m f5dcFQ//R5MRfOwLFqvNO2wwh750ijbR9tlUn9ce+PVQRpM1m1AhcDD9h98ZxNjn 8rwxMPTJVd0E8GV5BG5B7vaYYQySuU6C9LAbDDFL1mWOSf2VFIY8U6YntqasQ77K HGXdFhHKlCLCwIGTvQgJ4Dnu6Ds2mjm83wH9IZ0SXdwHZsr5MeSiOmtpjDZn/Efm isx+OBjf4uYEwo02qzMzdX5mmj2eXDwincjK9dEUXYn6yyzIDEwo/wUDtzsaxuui TKm1Ni0uul8idukNOH+Clrp+sSDN+bR57mLhBZuToGxBbdMLaHBHOABYSX5BIDKv YCHYaIFrya9dtcZdTk5sIEj94hSwl63PP37RZTS/o/djMNWYNkiUmay+UtRpDkk2 xbzx+C2hgb5OeGiI4ZDBrcIDi5bf5fIAT6yE8hfL853phloH15jlup9dnZQlB4B3 PsdQEdJZY3uoOQSJ31/okDRFSxR98xClZxZX+N7zdXWcYtP1LXUk+vNTt44riw8C i3MBBWF2kxsGQ/r5J0phFRKunWCRjUQD36co4m7hJUYHqdJq2jNnSvk6O6F4R+yv IRQOs+qpX2TdMkNJ2jGaV8d4pt0f5bMLPeh3vl3Smf1xzfX+X0E4trtXTsw0nIrD m52ZV93Zag3Q4SkQ3ir5r/lfqX8sybJbVqZba85abtiqSSDIsFY= =GqdB -----END PGP SIGNATURE----- Merge tag 'nfsd-6.9-6' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux Pull nfsd fix from Chuck Lever: - Avoid freeing unallocated memory (v6.7 regression) * tag 'nfsd-6.9-6' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: NFSD: Fix nfsd4_encode_fattr4() crasher
This commit is contained in:
commit
a91bae8794
|
@ -3515,6 +3515,7 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,
|
||||||
args.exp = exp;
|
args.exp = exp;
|
||||||
args.dentry = dentry;
|
args.dentry = dentry;
|
||||||
args.ignore_crossmnt = (ignore_crossmnt != 0);
|
args.ignore_crossmnt = (ignore_crossmnt != 0);
|
||||||
|
args.acl = NULL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Make a local copy of the attribute bitmap that can be modified.
|
* Make a local copy of the attribute bitmap that can be modified.
|
||||||
|
@ -3573,7 +3574,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,
|
||||||
} else
|
} else
|
||||||
args.fhp = fhp;
|
args.fhp = fhp;
|
||||||
|
|
||||||
args.acl = NULL;
|
|
||||||
if (attrmask[0] & FATTR4_WORD0_ACL) {
|
if (attrmask[0] & FATTR4_WORD0_ACL) {
|
||||||
err = nfsd4_get_nfs4_acl(rqstp, dentry, &args.acl);
|
err = nfsd4_get_nfs4_acl(rqstp, dentry, &args.acl);
|
||||||
if (err == -EOPNOTSUPP)
|
if (err == -EOPNOTSUPP)
|
||||||
|
|
Loading…
Reference in a new issue