* [PATCH AUTOSEL 4.19 2/2] btrfs: fix warning on PTR_ERR() against NULL device at btrfs_control_ioctl() [not found] <20241124124231.3337202-1-sashal@kernel.org> @ 2024-11-24 12:42 ` Sasha Levin 2024-12-02 12:04 ` Pavel Machek 0 siblings, 1 reply; 2+ messages in thread From: Sasha Levin @ 2024-11-24 12:42 UTC (permalink / raw) To: linux-kernel, stable Cc: Filipe Manana, Qu Wenruo, David Sterba, Sasha Levin, clm, josef, linux-btrfs From: Filipe Manana <fdmanana@suse.com> [ 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 <wqu@suse.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- 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 a595439518519..086d6d397f0be 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -2283,7 +2283,10 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, &btrfs_root_fs_type); 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 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH AUTOSEL 4.19 2/2] btrfs: fix warning on PTR_ERR() against NULL device at btrfs_control_ioctl() 2024-11-24 12:42 ` [PATCH AUTOSEL 4.19 2/2] btrfs: fix warning on PTR_ERR() against NULL device at btrfs_control_ioctl() Sasha Levin @ 2024-12-02 12:04 ` Pavel Machek 0 siblings, 0 replies; 2+ messages in thread From: Pavel Machek @ 2024-12-02 12:04 UTC (permalink / raw) To: Sasha Levin Cc: linux-kernel, stable, Filipe Manana, Qu Wenruo, David Sterba, clm, josef, linux-btrfs [-- Attachment #1: Type: text/plain, Size: 1083 bytes --] Hi! > From: Filipe Manana <fdmanana@suse.com> > > [ 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. This patch was wrongly ported to 4.19. It is not needed there. Same test is already performed 2 lines above. Please drop. BR, Pavel > +++ b/fs/btrfs/super.c > @@ -2283,7 +2283,10 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, > &btrfs_root_fs_type); > 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 == -- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-02 12:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20241124124231.3337202-1-sashal@kernel.org>
2024-11-24 12:42 ` [PATCH AUTOSEL 4.19 2/2] btrfs: fix warning on PTR_ERR() against NULL device at btrfs_control_ioctl() Sasha Levin
2024-12-02 12:04 ` Pavel Machek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox