diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-07-04 16:04:19 -0400 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-08-04 14:41:41 -0400 |
| commit | 82bec81e4d7d53b46fca391774271f801b18d6e5 (patch) | |
| tree | 565e8de4ce12becb722499d6814e77bad1f1e7eb | |
| parent | c7f10946b88af6d5d82bc9f84d008f0d089972d9 (diff) | |
9p: forgetting to cancel request on interrupted zero-copy RPC
[ Upstream commit a84b69cb6e0a41e86bc593904faa6def3b957343 ]
If we'd already sent a request and decide to abort it, we *must*
issue TFLUSH properly and not just blindly reuse the tag, or
we'll get seriously screwed when response eventually arrives
and we confuse it for response to later request that had reused
the same tag.
Cc: stable@vger.kernel.org # v3.2 and later
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | net/9p/client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index e86a9bea1d16..53fe98ee8a55 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -850,7 +850,8 @@ static struct p9_req_t *p9_client_zc_rpc(struct p9_client *c, int8_t type, if (err < 0) { if (err == -EIO) c->status = Disconnected; - goto reterr; + if (err != -ERESTARTSYS) + goto reterr; } if (req->status == REQ_STATUS_ERROR) { p9_debug(P9_DEBUG_ERROR, "req_status error %d\n", req->t_err); |