Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2651239pxj; Mon, 14 Jun 2021 04:04:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+bW3u3rdqYzt9uWqKAcFTn4fp6tMsFq3joLLxrVkdfJeiOiwOS87/ms/AXOXeIrQSqa1l X-Received: by 2002:a17:906:3c44:: with SMTP id i4mr14776296ejg.135.1623668669527; Mon, 14 Jun 2021 04:04:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623668669; cv=none; d=google.com; s=arc-20160816; b=xavU5/SiDq/SurK46HfCHzhOAiTcpzYVOovCyrnE4Xo5V1Q+Zsi4SoXewPY2gHfIsu 5VJuXL1m4hy6ignf1832PvOBec4IG5SDrjb1+cj4xSCWVNlNyxkTAe5bvyds36VMcJ1a T2uhptUsy8rXtz7qNiYTKkmGU38oikOLX7AZl/P0GYUteL5ohD6mH2+F9sJFBCqN5IBy 2rRgqKJD/5Qv+IPrQfRkuMf5UXeY3AVOZ3a0AC6cfJrWNiGTIfw0Y12+jL2XIuq6f0xi QfQTCpKQQ4xI+G8TDQXMr5f47+R4gB1FP7noeCB3frCyheSQMGwwjiipjCJtQ6emKV1x sBgA== 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=6IlgrLvqUQqnDuOj28vx/zsQ8zlWKUQUUJJb0rV98tk=; b=CW6Xro5xsGt+eXlfxMERwyUaDQxUAmxs38ONg0y4kzmNfWWP9WfLB4YO+0qrThj3// odXXlboWgdWk7e3v4LOKpdMXB4681GX/Wi8wnGYFrFOmn+oBbyJOb6yVH8OmF1ONEDXV mmYMwGHNhNT8U/Cc59GiSrCcQkm9vyu0a+KD7hKcZ4CvWJJRIuHCgaUE7FWM9dQKqj5x /gzzsIHCuAD2l1T2EeI8hNbIz5AudAEVp0cKGEC3sRFcOtrSLXbNDdUbD9c5ZH8V3a26 T3jJbrjOj3G96fx5ubPdsNzjnQLw/5GOiWUk/nmywhm5C8Nv7GyyhxyvNiHxb6/v7ysQ XEqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jyihUaBv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t26si11037136edf.425.2021.06.14.04.04.07; Mon, 14 Jun 2021 04:04:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jyihUaBv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235046AbhFNLEk (ORCPT + 99 others); Mon, 14 Jun 2021 07:04:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:58050 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234854AbhFNKyi (ORCPT ); Mon, 14 Jun 2021 06:54:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D533B61493; Mon, 14 Jun 2021 10:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623667217; bh=semQgj5UxOlSDaqdQr+dG80vFTxmFn52UONl68Yr8bI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jyihUaBvmuMBrvaKFGhJQpPvI4kKJ7iLfBjg5KTKfTr8kKKBqyEtrok7ptwdI1NoX RRuFlUR6Y0a2zqzP6Kv5CG/0OTW5dCH1Ii3ZfIBU4q9IjW4FVcCzXhIJQGwGo9w7kz GSZJts6S2B2+0+qJnjEeDOc0QZZa0ddsiI+DUDMc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Trond Myklebust , Sasha Levin Subject: [PATCH 5.4 72/84] NFS: Fix a potential NULL dereference in nfs_get_client() Date: Mon, 14 Jun 2021 12:27:50 +0200 Message-Id: <20210614102648.804103545@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102646.341387537@linuxfoundation.org> References: <20210614102646.341387537@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: Dan Carpenter [ Upstream commit 09226e8303beeec10f2ff844d2e46d1371dc58e0 ] None of the callers are expecting NULL returns from nfs_get_client() so this code will lead to an Oops. It's better to return an error pointer. I expect that this is dead code so hopefully no one is affected. Fixes: 31434f496abb ("nfs: check hostname in nfs_get_client") Signed-off-by: Dan Carpenter Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index a05f77f9c21e..af838d1ed281 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -399,7 +399,7 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init) if (cl_init->hostname == NULL) { WARN_ON(1); - return NULL; + return ERR_PTR(-EINVAL); } /* see if the client already exists */ -- 2.30.2