4.9-stable patches

added patches:
	net-rds-correct-socket-tunable-error-in-rds_tcp_tune.patch

diff --git a/queue-4.9/net-rds-correct-socket-tunable-error-in-rds_tcp_tune.patch b/queue-4.9/net-rds-correct-socket-tunable-error-in-rds_tcp_tune.patch
new file mode 100644 (file)
index 0000000..26f666d
--- /dev/null
+++ b/queue-4.9/net-rds-correct-socket-tunable-error-in-rds_tcp_tune.patch
@@ -0,0 +1,32 @@
+From 19f36edf14bcdb783aef3af8217df96f76a8ce34 Mon Sep 17 00:00:00 2001
+From: William Kucharski <william.kucharski@oracle.com>
+Date: Wed, 1 Dec 2021 07:45:22 -0700
+Subject: net/rds: correct socket tunable error in rds_tcp_tune()
+
+From: William Kucharski <william.kucharski@oracle.com>
+
+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: c6a58ffed536 ("RDS: TCP: Add sysctl tunables for sndbuf/rcvbuf on rds-tcp socket")
+Signed-off-by: William Kucharski <william.kucharski@oracle.com>
+Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/rds/tcp.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/rds/tcp.c
++++ b/net/rds/tcp.c
+@@ -389,7 +389,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);

diff --git a/queue-4.9/series b/queue-4.9/series
index bf6433f5e1856488af9c0dc99dfb16dc7f6831cb..4732284c09da3f2bc51a8f6d6d35abc3695320a4 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -54,3 +54,4 @@ fget-check-that-the-fd-still-exists-after-getting-a-ref-to-it.patch
 natsemi-xtensa-fix-section-mismatch-warnings.patch
 net-qlogic-qlcnic-fix-a-null-pointer-dereference-in-qlcnic_83xx_add_rings.patch
 siphash-use-_unaligned-version-by-default.patch
+net-rds-correct-socket-tunable-error-in-rds_tcp_tune.patch