From mboxrd@z Thu Jan 1 00:00:00 1970 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 25D49C433F5 for ; Mon, 6 Dec 2021 15:05:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347527AbhLFPI4 (ORCPT ); Mon, 6 Dec 2021 10:08:56 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:40036 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346620AbhLFPGy (ORCPT ); Mon, 6 Dec 2021 10:06:54 -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 ams.source.kernel.org (Postfix) with ESMTPS id 76174B81017; Mon, 6 Dec 2021 15:03:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0B4BC341C2; Mon, 6 Dec 2021 15:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1638803003; bh=30l//ft4KbWDcLNnGKxdSSZf5DUxIahUzNoQ+Ki3E+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2BJ/uYfP7EFqvx4O/OqCoCYoZfHVDvBarBY48X2S8gFkqXSzs0vobZObR4Il6KrXt DHZvPqE2kkb3xrQItgd/pHvX1beRT9kA/wl172ecSgb92z4vU20sUeuRVFopCnS1uk +AeUQrd1YILzwLSm9J4SY45853IFr5OnD8LojjhY= 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 4.9 57/62] net/rds: correct socket tunable error in rds_tcp_tune() Date: Mon, 6 Dec 2021 15:56:40 +0100 Message-Id: <20211206145551.178569703@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211206145549.155163074@linuxfoundation.org> References: <20211206145549.155163074@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -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);