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

Commit 87ee1280 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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 64c59a37 ("Remove unnecessary allocation")
parents 5fbf3e32 bf2c4b6f

net/sunrpc/auth_gss/svcauth_gss.c

+3 −2
Original line number Diff line number Diff line
@@ -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))