diff options
| author | Edward Adam Davis <eadavis@qq.com> | 2024-03-05 08:13:08 +0800 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-15 10:48:18 -0400 |
| commit | 2b505d05280739ce31d5708da840f42df827cb85 (patch) | |
| tree | c475fee458e3c5418434fd40d6e2f18848e0ead6 | |
| parent | 782c5fa6638faa22b7e32923718fd5766f59e417 (diff) | |
| download | linux-stable-2b505d05280739ce31d5708da840f42df827cb85.tar.gz linux-stable-2b505d05280739ce31d5708da840f42df827cb85.tar.bz2 linux-stable-2b505d05280739ce31d5708da840f42df827cb85.zip | |
net/rds: fix WARNING in rds_conn_connect_if_down
[ Upstream commit c055fc00c07be1f0df7375ab0036cebd1106ed38 ]
If connection isn't established yet, get_mr() will fail, trigger connection after
get_mr().
Fixes: 584a8279a44a ("RDS: RDMA: return appropriate error on rdma map failures")
Reported-and-tested-by: syzbot+d4faee732755bba9838e@syzkaller.appspotmail.com
Signed-off-by: Edward Adam Davis <eadavis@qq.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/rds/rdma.c | 3 | ||||
| -rw-r--r-- | net/rds/send.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/net/rds/rdma.c b/net/rds/rdma.c index fba82d36593a..a4e3c5de998b 100644 --- a/net/rds/rdma.c +++ b/net/rds/rdma.c @@ -301,6 +301,9 @@ static int __rds_rdma_map(struct rds_sock *rs, struct rds_get_mr_args *args, kfree(sg); } ret = PTR_ERR(trans_private); + /* Trigger connection so that its ready for the next retry */ + if (ret == -ENODEV) + rds_conn_connect_if_down(cp->cp_conn); goto out; } diff --git a/net/rds/send.c b/net/rds/send.c index 5e57a1581dc6..2899def23865 100644 --- a/net/rds/send.c +++ b/net/rds/send.c @@ -1313,12 +1313,8 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len) /* Parse any control messages the user may have included. */ ret = rds_cmsg_send(rs, rm, msg, &allocated_mr, &vct); - if (ret) { - /* Trigger connection so that its ready for the next retry */ - if (ret == -EAGAIN) - rds_conn_connect_if_down(conn); + if (ret) goto out; - } if (rm->rdma.op_active && !conn->c_trans->xmit_rdma) { printk_ratelimited(KERN_NOTICE "rdma_op %p conn xmit_rdma %p\n", |