[PATCH kernel-4.19 1/2] SUNRPC: If there is no reply expected, bail early from call_decode
From: Trond Myklebust trond.myklebust@hammerspace.com
mainline inclusion from mainline-4.20-rc1 commit 9ee94d3ed6a4f75dbf0a022927021a42a24dbdf8 category: bugfix bugzilla: 51820 CVE: NA
-------------------------------------------------
Signed-off-by: Trond Myklebust trond.myklebust@hammerspace.com Signed-off-by: Huang Guobin huangguobin4@huawei.com Reviewed-by: Yue Haibing yuehaibing@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- net/sunrpc/clnt.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index ccd5d5735be16..abdae040d229e 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -2264,6 +2264,11 @@ call_decode(struct rpc_task *task)
dprint_status(task);
+ if (!decode) { + task->tk_action = rpc_exit_task; + return; + } + if (task->tk_flags & RPC_CALL_MAJORSEEN) { if (clnt->cl_chatty) { printk(KERN_NOTICE "%s: server %s OK\n", @@ -2301,13 +2306,11 @@ call_decode(struct rpc_task *task) goto out_retry; return; } - task->tk_action = rpc_exit_task;
- if (decode) { - task->tk_status = rpcauth_unwrap_resp(task, decode, req, p, - task->tk_msg.rpc_resp); - } + task->tk_status = rpcauth_unwrap_resp(task, decode, req, p, + task->tk_msg.rpc_resp); + dprintk("RPC: %5u call_decode result %d\n", task->tk_pid, task->tk_status); return;
From: Trond Myklebust trond.myklebust@hammerspace.com
mainline inclusion from mainline-4.20-rc1 commit 5ce970393bad41499d50dfaea525ac8f01cdbc30 category: bugfix bugzilla: 51820 CVE: NA
-------------------------------------------------
When asked to wake up an RPC task, it makes sense to test whether or not the task is still queued.
Signed-off-by: Trond Myklebust trond.myklebust@hammerspace.com Signed-off-by: Huang Guobin huangguobin4@huawei.com Reviewed-by: Yue Haibing yuehaibing@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- net/sunrpc/sched.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index e2808586c9e61..8d204d5a76187 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -474,6 +474,8 @@ void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq, struct rpc_wait_queue *queue, struct rpc_task *task) { + if (!RPC_IS_QUEUED(task)) + return; spin_lock_bh(&queue->lock); rpc_wake_up_task_on_wq_queue_locked(wq, queue, task); spin_unlock_bh(&queue->lock); @@ -484,6 +486,8 @@ void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq, */ void rpc_wake_up_queued_task(struct rpc_wait_queue *queue, struct rpc_task *task) { + if (!RPC_IS_QUEUED(task)) + return; spin_lock_bh(&queue->lock); rpc_wake_up_task_queue_locked(queue, task); spin_unlock_bh(&queue->lock);
-
Yang Yingliang