Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp48785lfv; Tue, 12 Apr 2022 16:48:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFDZ/YzNTPAf72ghv2a8KmQMtWC+UbdXJEZPR+oIl2VmEsbgAZsx6zpwzlc3wsMZAfh3NE X-Received: by 2002:a17:902:f78d:b0:14d:522e:deb3 with SMTP id q13-20020a170902f78d00b0014d522edeb3mr39727196pln.173.1649807307876; Tue, 12 Apr 2022 16:48:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649807307; cv=none; d=google.com; s=arc-20160816; b=AG+DfWkC6MO6Uu/NzerVBxwpQ3JjyniVP1LPv+wpNoBqQ/W6gPUj3fog2zWo8I0hkq WkkHSPG74fGaeW3hiQY4ovVIHDSYemyxLIcI/sjyQLwfT0S6E/Nhf06yW3eJ+pP7iwQq TiabQKKSbJN4EigaDYA+d7cdeNtIyC9aTKz0DTo39D8eZRzzoLnmp99rmk9jfRU/yKEX bUmH17xmWabazre/GWgWc439H+wuLuxR8kA7N+4AlTimZDWlbUW5ApG06nPfqnbPltEH HdW643tMB8yVx57TT3okce90aJLfzZ1KPnnKcKT+pEh0tVjxXOd4NJguefkD0WJHmNz2 uZNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fyDR/9fAEEHatllEs6hTQrfGTlGdYo4Yx5e6xlSHj3o=; b=PXzMPdk3J2g+SyDRRKU2dtUB6Mp2SGiBEErNTKCQdGWFln7D4eAL2FjEXNL+RilKyy 02girNGwP4Vc5Q669R55ASG3In27yEh7g7kRXbwXVwPphuzKnXtynzp+KPDr8OnqGUrV hu9eWzKZcdE7FvzzbvB3SGZTz6syNy+gznIJD1EoZuVebBjB04yNL8qShnFADKdaxPEF lfzriMGd7Z2S9MB+Zal31DBN8j3wUYkQG9yYpmQ/ejUDlMeEIFY9pmey/xF8lyr6gl6i uS+8MnOwwB4r9m64Ia/31B4uX0prvfE3jXHpyv5YxnTFHimvNk7LdcX5FFBbyioLGq3n u/+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xUovsqyX; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id c12-20020a170902724c00b00153b2d165c2si11837777pll.458.2022.04.12.16.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 16:48:27 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xUovsqyX; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id ED1C21DB7C5; Tue, 12 Apr 2022 14:41:06 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380138AbiDLIVW (ORCPT + 99 others); Tue, 12 Apr 2022 04:21:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353933AbiDLHZ5 (ORCPT ); Tue, 12 Apr 2022 03:25:57 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C9C91263E; Tue, 12 Apr 2022 00:05:14 -0700 (PDT) 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 9AA78B81A8F; Tue, 12 Apr 2022 07:05:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09BB9C385A6; Tue, 12 Apr 2022 07:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649747111; bh=4kHxTx+nZTZet0xhrBn9ebOlglwAHA+XhrKvmS0m9VA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xUovsqyXJP3uyjWzgBdDLYVbZP2asZRpih4yMIIHavrNsb+IJUg6ukbJCMGT0tl9b p0mbKGYNI8s3AxQnB/bEaMZAPnw4CYrbjr8Idbce6/YRjUl8upJQ6Uapkgfn7mXlA3 mD94iwoAz2xNp5zrRYrx91OyaKieqX2ERrfBGxr0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Sasha Levin Subject: [PATCH 5.16 207/285] SUNRPC: svc_tcp_sendmsg() should handle errors from xdr_alloc_bvec() Date: Tue, 12 Apr 2022 08:31:04 +0200 Message-Id: <20220412062949.633716901@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust [ Upstream commit b056fa070814897be32d83b079dbc311375588e7 ] The allocation is done with GFP_KERNEL, but it could still fail in a low memory situation. Fixes: 4a85a6a3320b ("SUNRPC: Handle TCP socket sends with kernel_sendpage() again") Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- net/sunrpc/svcsock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 478f857cdaed..6ea3d87e1147 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1096,7 +1096,9 @@ static int svc_tcp_sendmsg(struct socket *sock, struct xdr_buf *xdr, int ret; *sentp = 0; - xdr_alloc_bvec(xdr, GFP_KERNEL); + ret = xdr_alloc_bvec(xdr, GFP_KERNEL); + if (ret < 0) + return ret; ret = kernel_sendmsg(sock, &msg, &rm, 1, rm.iov_len); if (ret < 0) -- 2.35.1