mirror of
https://github.com/LineageOS/android_kernel_fxtec_sm6115.git
synced 2026-08-18 13:31:09 +00:00
net/rds: rds_sendmsg should not discard payload_len
[ Upstream commit da29e453dcb3aa7cabead7915f5f945d0add3a52 ] Commit3db6e0d172("rds: use RCU to synchronize work-enqueue with connection teardown") modifies rds_sendmsg to avoid enqueueing work while a tear down is in progress. However, it also changed the return value of rds_sendmsg to that of rds_send_xmit instead of the payload_len. This means the user may incorrectly receive errno values when it should have simply received a payload of 0 while the peer attempts a reconnections. So this patch corrects the teardown handling code to only use the out error path in that case, thus restoring the original payload_len return value. Fixes:3db6e0d172("rds: use RCU to synchronize work-enqueue with connection teardown") Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: Allison Henderson <achender@kernel.org> Link: https://patch.msgid.link/20260213035409.1963391-1-achender@kernel.org Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Ulrich Hecht <uli@kernel.org>
This commit is contained in:
committed by
Ulrich Hecht
parent
311d876e64
commit
aaa978ac1c
@ -1368,9 +1368,11 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
|
||||
else
|
||||
queue_delayed_work(rds_wq, &cpath->cp_send_w, 1);
|
||||
rcu_read_unlock();
|
||||
|
||||
if (ret)
|
||||
goto out;
|
||||
}
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
rds_message_put(rm);
|
||||
|
||||
for (ind = 0; ind < vct.indx; ind++)
|
||||
|
||||
Reference in New Issue
Block a user