Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp15086lfv; Tue, 12 Apr 2022 15:20:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhIMq6EXBypV2388y3FEt1cxLwGvwD6HP8ER/G/3cmbeNs579K27+Vw6dtMDU3LVcqLz4l X-Received: by 2002:a17:90b:4f92:b0:1cd:3a73:3a46 with SMTP id qe18-20020a17090b4f9200b001cd3a733a46mr3755537pjb.66.1649802030628; Tue, 12 Apr 2022 15:20:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649802030; cv=none; d=google.com; s=arc-20160816; b=pZUVCBh3ywmh1CCGNnXJaXDiR7Zm/4kNd99e5zg0Isx2ajc34sgpYxiEuKkl5fFNkc e6OwM/Z+d6/p178wzLY24SRfg/z6n3ybNff3lT3eM3Ipo0HjsAxbYHRtIGxmZIHt3ge4 qagrZ0VHbwbc/Fh2fFoU60Pr19/v27ayqsE19I6WXyysBA8o6RCKj9YNKpywtrp7zc8v wl8afJH25tSFJSM/v3wqXiDBrdO7KOcYrwGS3KfiNtkoOn4wCU2oz89mrsPhRCgTg0o3 z4/vbgi0uG3JAjtzNqrlC6TG3ww675KjJhb8k6ntn4PFoGq2ACTVqeS4pnQmv0HCMy8Y JxBQ== 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=wMtqpEmzDxrqjBcWD76CnA2kliVahOkf/26dhRWbhsI=; b=XFsL6/Grj8K8DCB01mGWldpsryzYlnzstTnRxPyI9lPdFPF0DIFkfnwLVT4HW1DML8 ZJlqOgArXR+rZm09xXM2rOeUrL3rU9sewFTVFuaNXV4j1Z7RuYualZKmKYJZSKhaiy0/ Is8jcS5jDIYK42ElAACDtM4EKiSn2EStbJlzSQq2Ik/1uLV3B4785A+S+bEguArD2sYH 2jwGe7G9Xy096Ag4hjydLvp1ZG8d3WKeHlBBMtesjXm8v+x6ah1WiP9+hSGH67AO/VUX VDpSNLzO6lcfzVc55a5zV+4VRGXQJk60P+gJegtDPtK5eX7RDxqEUW8ut5sAPh7jy7jz VMuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZfIHzvok; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id bk11-20020a056a02028b00b003982f410437si3681745pgb.196.2022.04.12.15.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:20:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZfIHzvok; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 3AC72170DB9; Tue, 12 Apr 2022 14:01:12 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350912AbiDLGvc (ORCPT + 99 others); Tue, 12 Apr 2022 02:51:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351639AbiDLGp2 (ORCPT ); Tue, 12 Apr 2022 02:45:28 -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 CE5D93B3D1; Mon, 11 Apr 2022 23:38:55 -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 85D32B818C8; Tue, 12 Apr 2022 06:38:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00442C385A1; Tue, 12 Apr 2022 06:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649745533; bh=LD7zo3JOG/9bqZLh81Kty32eCuIvJR5j5cUU2/FODlk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZfIHzvok5Eli7li//fYiYopIndysg8pQmjsNLGe3wd3QIlUf7RallJmd3OqJq/7Ch fPWb3RjbNchNrGtXcfOg0OmhCKpWhftTeQuqr3BnSG0H/wRp1gmQjYpSBK3DUtOIBo TXxcuXVObi4EUsCIW3AIJutjYMDz6R8mx4WZgl6I= 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.10 129/171] SUNRPC: svc_tcp_sendmsg() should handle errors from xdr_alloc_bvec() Date: Tue, 12 Apr 2022 08:30:20 +0200 Message-Id: <20220412062931.617708057@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062927.870347203@linuxfoundation.org> References: <20220412062927.870347203@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 eba1714bf09a..6d5bb8bfed38 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1091,7 +1091,9 @@ static int svc_tcp_sendmsg(struct socket *sock, struct msghdr *msg, int flags, ret; *sentp = 0; - xdr_alloc_bvec(xdr, GFP_KERNEL); + ret = xdr_alloc_bvec(xdr, GFP_KERNEL); + if (ret < 0) + return ret; msg->msg_flags = MSG_MORE; ret = kernel_sendmsg(sock, msg, &rm, 1, rm.iov_len); -- 2.35.1