diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2016-06-29 13:55:14 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-10-07 10:06:53 +0200 |
| commit | a298420136714ed7e91bf8f76bddbdabda35c1e3 (patch) | |
| tree | bc8138242aeec8d88f78549bdc58e1b0a50a9716 | |
| parent | 5bc28d50a47c0d8c79f3c318736781cd83952963 (diff) | |
| download | linux-stable-a298420136714ed7e91bf8f76bddbdabda35c1e3.tar.gz linux-stable-a298420136714ed7e91bf8f76bddbdabda35c1e3.tar.bz2 linux-stable-a298420136714ed7e91bf8f76bddbdabda35c1e3.zip | |
svc: Avoid garbage replies when pc_func() returns rpc_drop_reply
commit 0533b13072f4bf35738290d2cf9e299c7bc6c42a upstream.
If an RPC program does not set vs_dispatch and pc_func() returns
rpc_drop_reply, the server sends a reply anyway containing a single
word containing the value RPC_DROP_REPLY (in network byte-order, of
course). This is a nonsense RPC message.
Fixes: 9e701c610923 ("svcrpc: simpler request dropping")
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: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | net/sunrpc/svc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index b974571126fe..e7e552a07f6f 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1182,7 +1182,8 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) *statp = procp->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp); /* Encode reply */ - if (rqstp->rq_dropme) { + if (*statp == rpc_drop_reply || + rqstp->rq_dropme) { if (procp->pc_release) procp->pc_release(rqstp, NULL, rqstp->rq_resp); goto dropit; |