2021-03-17 18:30:35

by William Kucharski

Subject: [PATCH] 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.

Signed-off-by: William Kucharski <[email protected]>
---
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 43db0eca911f..130e5988f956 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.30.2

2021-03-17 21:27:38

by Santosh Shilimkar

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

(Previous reply bounced due to format so re-sending to the list for archives)

On Mar 17, 2021, at 7:52 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.
>
> Signed-off-by: William Kucharski <[email protected]>
> —
Looks good. Thanks !!
Acked-by: Santosh Shilimkar <[email protected]>

2021-03-19 16:52:53

by Matthew Wilcox

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

On Wed, Mar 17, 2021 at 08:52:04AM -0600, William Kucharski 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.
>
> Signed-off-by: William Kucharski <[email protected]>

Looks like a pretty clear copy-n-paste error. I think Coverity have
started looking for issues like this?

Reviewed-by: Matthew Wilcox (Oracle) <[email protected]>

Also, maybe,

Fixes: c6a58ffed536 ("RDS: TCP: Add sysctl tunables for sndbuf/rcvbuf on rds-tcp socket")