From patchwork Mon Dec 6 14:56:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 522168 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8B94C433EF for ; Mon, 6 Dec 2021 15:14:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349205AbhLFPSR (ORCPT ); Mon, 6 Dec 2021 10:18:17 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:35714 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358516AbhLFPQk (ORCPT ); Mon, 6 Dec 2021 10:16:40 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D075D612D3; Mon, 6 Dec 2021 15:13:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9092C341C2; Mon, 6 Dec 2021 15:13:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1638803591; bh=nscPdAZsW2f2hTVahXnXoWDFXpV8r7pht70TBpwbgqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TI1NS7ip6WyCNWRD5skbrLEhmIYRV4h73SUuv/a+omRrgADSmpuwTh1y1Cu2aJOox VHigoBxUdLDbC8elGeVijgUFsysmrjNXKXVp7reMoqF2GPVeEoGg0XwUe6SopCSD9b dD0FNXkWGbZ/r7jP7w3qdW2zuIYwihmEXUWQyzoI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, William Kucharski , Santosh Shilimkar , "David S. Miller" Subject: [PATCH 5.4 47/70] net/rds: correct socket tunable error in rds_tcp_tune() Date: Mon, 6 Dec 2021 15:56:51 +0100 Message-Id: <20211206145553.547747947@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211206145551.909846023@linuxfoundation.org> References: <20211206145551.909846023@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 @@ -510,7 +510,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);