From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92DFD1D45F2; Sun, 24 Nov 2024 12:41:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732452072; cv=none; b=K5BO5bPxAgGYotvEHYrePevDeScbYjVQhdYiHGYSGtUfg6C1VqBhgluBo5ys0EbIAyuG1/p6iNPslchCm+SRaGya4VAMBJRg5kB5ddamLxU5k3EuCnPwhxsO3TEkdXAu5S3y2TTEV87b5ctP5oY9mgpQg/7yNOuR27egJ1Vf68M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732452072; c=relaxed/simple; bh=uok4ghp398S79+9MqyPXP44TJ3hnfkhHdbt0KqGPXyk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bLLZM5POpncFG2U78aMlmebPTOI0qtAt3Ggqln+cCT+XQvzlOmed1OhjXrt3kXUEkdi6B1DkFvnA/gFhnWZNKd+srcrYkydF3DCgIoRAkasekfDyhaBj4P2Behzv27L2JI0/xsZnCdJCMjZ3w4+oARqmQPxY8s8XwBom9ICkijY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RbJc9ULe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RbJc9ULe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E633C4CED1; Sun, 24 Nov 2024 12:41:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732452072; bh=uok4ghp398S79+9MqyPXP44TJ3hnfkhHdbt0KqGPXyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RbJc9ULe5sqnHUs4Sd4jp90bEOGRQaYwsNTPrNYurqWfje/4e7I7HP2/GwRc8Qein VyZZNIFS02O7bnVKPKrvxZz8AJimXnyiNB7PDCf0FIfCTXJeAzKWPAftE+0i9KGdtA 0/7FGKa2d1IeeSn73C+2uoTLdLvZWN1VCTUtkwBhceYIrvwKYOK82wLEM6QgOrEIuB t//fNvPvD/A38aHSjJJGwWUGygrzo1RG7b1TSPcpviOcO7Tsd2W0H9p0oRDp/ryrhf uBEv/qiNzN5GBxzU5JEig/JeZc8c+ykCsOIu51hmSA479UGCeQ95XSdSVcdrfhRJHG vA2yMRUZtHdQg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Filipe Manana , Qu Wenruo , David Sterba , Sasha Levin , clm@fb.com, josef@toxicpanda.com, linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 7/9] btrfs: fix warning on PTR_ERR() against NULL device at btrfs_control_ioctl() Date: Sun, 24 Nov 2024 07:40:45 -0500 Message-ID: <20241124124057.3336453-7-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124124057.3336453-1-sashal@kernel.org> References: <20241124124057.3336453-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.63 Content-Transfer-Encoding: 8bit From: Filipe Manana [ Upstream commit 2342d6595b608eec94187a17dc112dd4c2a812fa ] Smatch complains about calling PTR_ERR() against a NULL pointer: fs/btrfs/super.c:2272 btrfs_control_ioctl() warn: passing zero to 'PTR_ERR' Fix this by calling PTR_ERR() against the device pointer only if it contains an error. Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/super.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index e33587a814098..4c98eb5230184 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -2216,7 +2216,10 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, device = btrfs_scan_one_device(vol->name, BLK_OPEN_READ); if (IS_ERR(device)) { mutex_unlock(&uuid_mutex); - ret = PTR_ERR(device); + if (IS_ERR(device)) + ret = PTR_ERR(device); + else + ret = 0; break; } ret = !(device->fs_devices->num_devices == -- 2.43.0