Commit da29e453 authored by Allison Henderson's avatar Allison Henderson Committed by Paolo Abeni
Browse files

net/rds: rds_sendmsg should not discard payload_len 



Commit 3db6e0d1 ("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: 3db6e0d1 ("rds: use RCU to synchronize work-enqueue with connection teardown")
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarAllison Henderson <achender@kernel.org>
Link: https://patch.msgid.link/20260213035409.1963391-1-achender@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 6d1dc801

net/rds/send.c

+4 −2
Original line number Diff line number Diff line
@@ -1431,9 +1431,11 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len) 
		else

			queue_delayed_work(cpath->cp_wq, &cpath->cp_send_w, 1);

		rcu_read_unlock();

	}



		if (ret)

			goto out;

	}



	rds_message_put(rm);



	for (ind = 0; ind < vct.indx; ind++)