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

Commit 11560e97 authored by William Kucharski's avatar William Kucharski Committed by Greg Kroah-Hartman
Browse files

net/rds: correct socket tunable error in rds_tcp_tune() 



commit 19f36edf14bcdb783aef3af8217df96f76a8ce34 upstream.

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: c6a58ffe ("RDS: TCP: Add sysctl tunables for sndbuf/rcvbuf on rds-tcp socket")
Signed-off-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2fd94936

net/rds/tcp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -502,7 +502,7 @@ void rds_tcp_tune(struct socket *sock) 
		sk->sk_userlocks |= SOCK_SNDBUF_LOCK;

		sk->sk_userlocks |= SOCK_SNDBUF_LOCK;

	}

	}

	if (rtn->rcvbuf_size > 0) {

	if (rtn->rcvbuf_size > 0) {

		sk->sk_sndbuf = rtn->rcvbuf_size;

		sk->sk_rcvbuf = rtn->rcvbuf_size;

		sk->sk_userlocks |= SOCK_RCVBUF_LOCK;

		sk->sk_userlocks |= SOCK_RCVBUF_LOCK;

	}

	}

	release_sock(sk);

	release_sock(sk);