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 C40B3C43219 for ; Thu, 3 Feb 2022 20:34:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354808AbiBCUeZ (ORCPT ); Thu, 3 Feb 2022 15:34:25 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:38854 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354736AbiBCUcw (ORCPT ); Thu, 3 Feb 2022 15:32:52 -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 C6076619D3; Thu, 3 Feb 2022 20:32:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DC1BC340E8; Thu, 3 Feb 2022 20:32:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643920371; bh=QpdYhPz1QbxmW08mKdB8W1Sz1fYm/QS12h4YxaF3K4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zhx2Nlx1ASKHznaRZ9+bppLWe4Dx5HbVrcMzRQbzurUPBaw1rHF+P/k0z7XH6YfjM Q0E9M6PBXSDFoRfath4zcDAV3LN8Me73shsffxkZDNfdqPYJVExa/X+FvuSQ/WUevY Kfsnk3hAVp6eKUgSqcM/EushlTSLnF/jkJnKMRwBHW+042jkUvHIYUn28bvmATnRO6 p6ZzArkpNWTwtjfTgvK5HZdPjz85ZbSBAPxHbRQbyXrnDEDMBxC3u2zQLtf6Mm4Ua0 yIlu8G5pIIVK70xU50qh4d9YM5oEETaTAsKU+KPdihlifKZ/Z8Xc435Gbnwgf+a7K9 bqYPF/EytjwZg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiaoke Wang , Anna Schumaker , Sasha Levin , trond.myklebust@hammerspace.com, anna.schumaker@netapp.com, linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 03/41] nfs: nfs4clinet: check the return value of kstrdup() Date: Thu, 3 Feb 2022 15:32:07 -0500 Message-Id: <20220203203245.3007-3-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203203245.3007-1-sashal@kernel.org> References: <20220203203245.3007-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiaoke Wang [ Upstream commit fbd2057e5329d3502a27491190237b6be52a1cb6 ] kstrdup() returns NULL when some internal memory errors happen, it is better to check the return value of it so to catch the memory error in time. Signed-off-by: Xiaoke Wang Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/nfs4client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index af57332503bed..ed06b68b2b4e9 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -1368,8 +1368,11 @@ int nfs4_update_server(struct nfs_server *server, const char *hostname, } nfs_put_client(clp); - if (server->nfs_client->cl_hostname == NULL) + if (server->nfs_client->cl_hostname == NULL) { server->nfs_client->cl_hostname = kstrdup(hostname, GFP_KERNEL); + if (server->nfs_client->cl_hostname == NULL) + return -ENOMEM; + } nfs_server_insert_lists(server); return nfs_probe_destination(server); -- 2.34.1