Skip to content

Commit

Permalink
Merge tag 'nfsd-4.8-2' of git://linux-nfs.org/~bfields/linux
Browse files Browse the repository at this point in the history
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 64c59a3 ("Remove unnecessary allocation")
  • Loading branch information
Linus Torvalds committed Sep 17, 2016
2 parents 5fbf3e3 + bf2c4b6 commit 87ee128
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/sunrpc/auth_gss/svcauth_gss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 87ee128

Please sign in to comment.