Merge tag 'nfsd-4.8-2' of git://linux-nfs.org/~bfields/linux

87ee1280 · Linus Torvalds <[email protected]> · 2016-09-16 17:00:26 -07:00

Pull nfsd bugfix from Bruce Fields:
 "Fix a memory corruption bug that I introduced in 4.7"

* tag 'nfsd-4.8-2' of git://linux-nfs.org/~bfields/linux:
  svcauth_gss: Revert 64c59a3726f2 ("Remove unnecessary allocation")

Commit: 87ee1280ff80e04adf9b36361235eef76cd80301
Parents: 5fbf3e32 · bf2c4b6f

Merge commit. Changes below are compared with the first parent: 5fbf3e32.

Changes

1 files changed · +3 −2

File	Status	Add	Del	Content
net/sunrpc/auth_gss/svcauth_gss.c	modified	+3	−2	View file

net/sunrpc/auth_gss/svcauth_gss.c

View file

diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 1d28181..d858202 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -569,9 +569,10 @@ gss_svc_searchbyctx(struct cache_detail *cd, struct xdr_netobj *handle)
 	struct rsc *found;
 
 	memset(&rsci, 0, sizeof(rsci));
-	rsci.handle.data = handle->data;
-	rsci.handle.len = handle->len;
+	if (dup_to_netobj(&rsci.handle, handle->data, handle->len))
+		return NULL;
 	found = rsc_lookup(cd, &rsci);
+	rsc_free(&rsci);
 	if (!found)
 		return NULL;
 	if (cache_check(cd, &found->h, NULL))