diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2016-06-29 13:55:22 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-11-20 01:01:25 +0000 |
| commit | 84f51dca935f35cdf0cd6c27365379970908629c (patch) | |
| tree | e15936a43e119657c4b61c414576e5fb17791381 /net | |
| parent | 80f69c177edf53936ec365c1d2d5c055efd498d3 (diff) | |
| download | linux-84f51dca935f35cdf0cd6c27365379970908629c.tar.gz linux-84f51dca935f35cdf0cd6c27365379970908629c.tar.bz2 linux-84f51dca935f35cdf0cd6c27365379970908629c.zip | |
NFS: Don't drop CB requests with invalid principals
commit a4e187d83d88eeaba6252aac0a2ffe5eaa73a818 upstream.
Before commit 778be232a207 ("NFS do not find client in NFSv4
pg_authenticate"), the Linux callback server replied with
RPC_AUTH_ERROR / RPC_AUTH_BADCRED, instead of dropping the CB
request. Let's restore that behavior so the server has a chance to
do something useful about it, and provide a warning that helps
admins correct the problem.
Fixes: 778be232a207 ("NFS do not find client in NFSv4 ...")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/svc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 9a70a8082c7c..efd443dbacf9 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1172,6 +1172,11 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) procp->pc_release(rqstp, NULL, rqstp->rq_resp); goto dropit; } + if (*statp == rpc_autherr_badcred) { + if (procp->pc_release) + procp->pc_release(rqstp, NULL, rqstp->rq_resp); + goto err_bad_auth; + } if (*statp == rpc_success && (xdr = procp->pc_encode) && !xdr(rqstp, resv->iov_base+resv->iov_len, rqstp->rq_resp)) { |