2021-12-01 14:46:06

by William Kucharski

Subject: [PATCH V2] net/rds: correct socket tunable error in rds_tcp_tune()

Correct an error where setting /proc/sys/net/rds/tcp/rds_tcp_rcvbuf would
instead modify the socket's sk_sndbuf and would leave sk_rcvbuf untouched.

Fixes: c6a58ffed536 ("RDS: TCP: Add sysctl tunables for sndbuf/rcvbuf on rds-tcp socket")
Signed-off-by: William Kucharski <[email protected]>
---
V2: Add Fixes tag to refer to original commit that introduced the issue

net/rds/tcp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index abf19c0e3ba0..5327d130c4b5 100644
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -500,7 +500,7 @@ void rds_tcp_tune(struct socket *sock)
sk->sk_userlocks |= SOCK_SNDBUF_LOCK;
}
if (rtn->rcvbuf_size > 0) {
- sk->sk_sndbuf = rtn->rcvbuf_size;
+ sk->sk_rcvbuf = rtn->rcvbuf_size;
sk->sk_userlocks |= SOCK_RCVBUF_LOCK;
}
release_sock(sk);
--
2.33.1

2021-12-01 15:42:35

by Santosh Shilimkar

Subject: Re: [PATCH V2] net/rds: correct socket tunable error in rds_tcp_tune()

> On Dec 1, 2021, at 6:45 AM, William Kucharski <[email protected]> wrote:
>
> Correct an error where setting /proc/sys/net/rds/tcp/rds_tcp_rcvbuf would
> instead modify the socket's sk_sndbuf and would leave sk_rcvbuf untouched.
>
> Fixes: c6a58ffed536 ("RDS: TCP: Add sysctl tunables for sndbuf/rcvbuf on rds-tcp socket")
> Signed-off-by: William Kucharski <[email protected]>
> ---
> V2: Add Fixes tag to refer to original commit that introduced the issue

Good catch.

Acked-by: Santosh Shilimkar <[email protected]>

2021-12-02 12:20:16

by patchwork-bot+netdevbpf

Subject: Re: [PATCH V2] net/rds: correct socket tunable error in rds_tcp_tune()

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

On Wed, 1 Dec 2021 07:45:22 -0700 you wrote:
> Correct an error where setting /proc/sys/net/rds/tcp/rds_tcp_rcvbuf would
> instead modify the socket's sk_sndbuf and would leave sk_rcvbuf untouched.
>
> Fixes: c6a58ffed536 ("RDS: TCP: Add sysctl tunables for sndbuf/rcvbuf on rds-tcp socket")
> Signed-off-by: William Kucharski <[email protected]>
> ---
> V2: Add Fixes tag to refer to original commit that introduced the issue
>
> [...]

Here is the summary with links:
- [V2] net/rds: correct socket tunable error in rds_tcp_tune()
https://git.kernel.org/netdev/net/c/19f36edf14bc

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html