Commit a91bae87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9e4bc4bc 18180a45

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -3515,6 +3515,7 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr, 
	args.exp = exp;

	args.dentry = dentry;

	args.ignore_crossmnt = (ignore_crossmnt != 0);

	args.acl = NULL;



	/*

	 * 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

		args.fhp = fhp;



	args.acl = NULL;

	if (attrmask[0] & FATTR4_WORD0_ACL) {

		err = nfsd4_get_nfs4_acl(rqstp, dentry, &args.acl);

		if (err == -EOPNOTSUPP)