Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01529e3f authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

NFSD: Fix memory leak in encoding denied lock 



Commit 8c7424cf (nfsd4: don't try to encode conflicting owner if low on space)
forgot free conf->data in nfsd4_encode_lockt and before sign conf->data to NULL
in nfsd4_encode_lock_denied.

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 0fe492db

fs/nfsd/nfs4xdr.c

+3 −1
Original line number Diff line number Diff line
@@ -2874,6 +2874,7 @@ nfsd4_encode_lock_denied(struct xdr_stream *xdr, struct nfsd4_lock_denied *ld) 
		 * return the conflicting open:

		 */

		if (conf->len) {

			kfree(conf->data);

			conf->len = 0;

			conf->data = NULL;

			goto again;
@@ -2886,6 +2887,7 @@ nfsd4_encode_lock_denied(struct xdr_stream *xdr, struct nfsd4_lock_denied *ld) 
	if (conf->len) {

		p = xdr_encode_opaque_fixed(p, &ld->ld_clientid, 8);

		p = xdr_encode_opaque(p, conf->data, conf->len);

		kfree(conf->data);

	}  else {  /* non - nfsv4 lock in conflict, no clientid nor owner */

		p = xdr_encode_hyper(p, (u64)0); /* clientid */

		*p++ = cpu_to_be32(0); /* length of owner name */
@@ -2902,7 +2904,7 @@ nfsd4_encode_lock(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_lo 
		nfserr = nfsd4_encode_stateid(xdr, &lock->lk_resp_stateid);

	else if (nfserr == nfserr_denied)

		nfserr = nfsd4_encode_lock_denied(xdr, &lock->lk_denied);

	kfree(lock->lk_denied.ld_owner.data);



	return nfserr;

}