linux-kernel - Re: [Cocci] [PATCH 1/1] ntfs: Deletion of unnecessary checks before the function call "iput"

Open Source and information security mailing list archives

Message-ID: <alpine.DEB.2.02.1411152053430.2225@localhost6.localdomain6>
Date:	Sat, 15 Nov 2014 20:54:22 +0100 (CET)
From:	Julia Lawall <julia.lawall@...6.fr>
To:	SF Markus Elfring <elfring@...rs.sourceforge.net>
cc:	Anton Altaparmakov <anton@...era.com>,
	linux-ntfs-dev@...ts.sourceforge.net, trivial@...nel.org,
	kernel-janitors@...r.kernel.org, linux-kernel@...r.kernel.org,
	Coccinelle <cocci@...teme.lip6.fr>
Subject: Re: [Cocci] [PATCH 1/1] ntfs: Deletion of unnecessary checks before
 the function call "iput"

On Sat, 15 Nov 2014, SF Markus Elfring wrote:

> From: Markus Elfring <elfring@...rs.sourceforge.net>
> Date: Sat, 15 Nov 2014 19:35:05 +0100
> 
> The iput() function tests whether its argument is NULL and then
> returns immediately. Thus the test around the call is not needed.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
> ---
>  fs/ntfs/super.c | 21 +++++++--------------
>  1 file changed, 7 insertions(+), 14 deletions(-)
> 
> diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
> index 6c3296e..8f22a47 100644
> --- a/fs/ntfs/super.c
> +++ b/fs/ntfs/super.c
> @@ -2204,17 +2204,12 @@ get_ctx_vol_failed:
>  	return true;
>  #ifdef NTFS_RW
>  iput_usnjrnl_err_out:

I don't have time to look at the code now, but since there is an exit 
label here, have you checked whether you could improve the gotos in these 
cases?

julia

> -	if (vol->usnjrnl_j_ino)
> -		iput(vol->usnjrnl_j_ino);
> -	if (vol->usnjrnl_max_ino)
> -		iput(vol->usnjrnl_max_ino);
> -	if (vol->usnjrnl_ino)
> -		iput(vol->usnjrnl_ino);
> +	iput(vol->usnjrnl_j_ino);
> +	iput(vol->usnjrnl_max_ino);
> +	iput(vol->usnjrnl_ino);
>  iput_quota_err_out:
> -	if (vol->quota_q_ino)
> -		iput(vol->quota_q_ino);
> -	if (vol->quota_ino)
> -		iput(vol->quota_ino);
> +	iput(vol->quota_q_ino);
> +	iput(vol->quota_ino);
>  	iput(vol->extend_ino);
>  #endif /* NTFS_RW */
>  iput_sec_err_out:
> @@ -2223,8 +2218,7 @@ iput_root_err_out:
>  	iput(vol->root_ino);
>  iput_logfile_err_out:
>  #ifdef NTFS_RW
> -	if (vol->logfile_ino)
> -		iput(vol->logfile_ino);
> +	iput(vol->logfile_ino);
>  iput_vol_err_out:
>  #endif /* NTFS_RW */
>  	iput(vol->vol_ino);
> @@ -2254,8 +2248,7 @@ iput_mftbmp_err_out:
>  	iput(vol->mftbmp_ino);
>  iput_mirr_err_out:
>  #ifdef NTFS_RW
> -	if (vol->mftmirr_ino)
> -		iput(vol->mftmirr_ino);
> +	iput(vol->mftmirr_ino);
>  #endif /* NTFS_RW */
>  	return false;
>  }
> -- 
> 2.1.3
> 
> 
> _______________________________________________
> Cocci mailing list
> Cocci@...teme.lip6.fr
> https://systeme.lip6.fr/mailman/listinfo/cocci
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives