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

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
...@@ -569,9 +569,10 @@ gss_svc_searchbyctx(struct cache_detail *cd, struct xdr_netobj *handle) ...@@ -569,9 +569,10 @@ gss_svc_searchbyctx(struct cache_detail *cd, struct xdr_netobj *handle)
struct rsc *found; struct rsc *found;
memset(&rsci, 0, sizeof(rsci)); memset(&rsci, 0, sizeof(rsci));
rsci.handle.data = handle->data; if (dup_to_netobj(&rsci.handle, handle->data, handle->len))
rsci.handle.len = handle->len; return NULL;
found = rsc_lookup(cd, &rsci); found = rsc_lookup(cd, &rsci);
rsc_free(&rsci);
if (!found) if (!found)
return NULL; return NULL;
if (cache_check(cd, &found->h, NULL)) if (cache_check(cd, &found->h, NULL))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment