From: Greg Kroah-Hartman Date: Sun, 5 Dec 2021 13:46:21 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.4.294~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=685f6cfbe28ac590364c4bde58d736ffcdc4528d;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..26f666dbc51 --- /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 +Date: Wed, 1 Dec 2021 07:45:22 -0700 +Subject: net/rds: correct socket tunable error in rds_tcp_tune() + +From: William Kucharski + +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 +Acked-by: Santosh Shilimkar +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + 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 bf6433f5e18..4732284c09d 100644 --- 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