leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SUNRPC: rpc_decode_header() must always return a non-zero value on error

Browse Source 
Ensure that when the "garbage args" case falls through, we do set
an error of EIO.

Fixes: a0584ee9ae ("SUNRPC: Use struct xdr_stream when decoding...")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2019-03-15 09:29:00 -04:00
parent 27adc78592
commit eb90a16e90
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/sunrpc/clnt.c
View File

@ -2454,7 +2454,7 @@ static noinline int
rpc_decode_header(struct rpc_task *task, struct xdr_stream *xdr) rpc_decode_header(struct rpc_task *task, struct xdr_stream *xdr)
{ {
struct rpc_clnt *clnt = task->tk_client; struct rpc_clnt *clnt = task->tk_client;
int error = -EACCES; int error;
__be32 *p; __be32 *p;
/* RFC-1014 says that the representation of XDR data must be a /* RFC-1014 says that the representation of XDR data must be a
@ -2463,7 +2463,7 @@ rpc_decode_header(struct rpc_task *task, struct xdr_stream *xdr)
* undefined results * undefined results
*/ */
if (task->tk_rqstp->rq_rcv_buf.len & 3) if (task->tk_rqstp->rq_rcv_buf.len & 3)
goto out_badlen; goto out_unparsable;
p = xdr_inline_decode(xdr, 3 * sizeof(*p)); p = xdr_inline_decode(xdr, 3 * sizeof(*p));
if (!p) if (!p)
@ -2498,9 +2498,10 @@ rpc_decode_header(struct rpc_task *task, struct xdr_stream *xdr)
goto out_err; goto out_err;
case rpc_garbage_args: case rpc_garbage_args:
trace_rpc__garbage_args(task); trace_rpc__garbage_args(task);
error = -EIO;
break; break;
default: default:
trace_rpc__unparsable(task); goto out_unparsable;
} }
out_garbage: out_garbage:
@ -2514,11 +2515,6 @@ out_err:
rpc_exit(task, error); rpc_exit(task, error);
return error; return error;
out_badlen:
trace_rpc__unparsable(task);
error = -EIO;
goto out_err;
out_unparsable: out_unparsable:
trace_rpc__unparsable(task); trace_rpc__unparsable(task);
error = -EIO; error = -EIO;
@ -2529,6 +2525,7 @@ out_verifier:
goto out_garbage; goto out_garbage;
out_msg_denied: out_msg_denied:
error = -EACCES;
p = xdr_inline_decode(xdr, sizeof(*p)); p = xdr_inline_decode(xdr, sizeof(*p));
if (!p) if (!p)
goto out_unparsable; goto out_unparsable;
@ -2540,9 +2537,7 @@ out_msg_denied:
error = -EPROTONOSUPPORT; error = -EPROTONOSUPPORT;
goto out_err; goto out_err;
default: default:
trace_rpc__unparsable(task); goto out_unparsable;
error = -EIO;
goto out_err;
} }
p = xdr_inline_decode(xdr, sizeof(*p)); p = xdr_inline_decode(xdr, sizeof(*p));
@ -2577,8 +2572,7 @@ out_msg_denied:
task->tk_xprt->servername); task->tk_xprt->servername);
break; break;
default: default:
trace_rpc__unparsable(task); goto out_unparsable;
error = -EIO;
} }
goto out_err; goto out_err;
} }