Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4168080 authored by David Howells's avatar David Howells Committed by Greg Kroah-Hartman
Browse files

rxrpc: Fix sendmsg(MSG_WAITALL) handling 



commit 498b577660f08cef5d9e78e0ed6dcd4c0939e98c upstream.

Fix the handling of sendmsg() with MSG_WAITALL for userspace to round the
timeout for when a signal occurs up to at least two jiffies as a 1 jiffy
timeout may end up being effectively 0 if jiffies wraps at the wrong time.

Fixes: bc5e3a54 ("rxrpc: Use MSG_WAITALL to tell sendmsg() to temporarily ignore signals")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be8a3aec

net/rxrpc/sendmsg.c

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ static int rxrpc_wait_for_tx_window_nonintr(struct rxrpc_sock *rx, 


	rtt = READ_ONCE(call->peer->rtt);

	rtt2 = nsecs_to_jiffies64(rtt) * 2;

	if (rtt2 < 1)

		rtt2 = 1;

	if (rtt2 < 2)

		rtt2 = 2;



	timeout = rtt2;

	tx_start = READ_ONCE(call->tx_hard_ack);