linux-kernel - Re: [PATCH] xfs: Use kmemdup() instead of kmalloc() and memcpy()

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20240426231836.GS360919@frogsfrogsfrogs>
Date: Fri, 26 Apr 2024 16:18:36 -0700
From: "Darrick J. Wong" <djwong@...nel.org>
To: Thorsten Blum <thorsten.blum@...lux.com>
Cc: Chandan Babu R <chandan.babu@...cle.com>,
	Dave Chinner <dchinner@...hat.com>,
	Colin Ian King <colin.i.king@...il.com>,
	Zhang Tianci <zhangtianci.1997@...edance.com>,
	linux-xfs@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] xfs: Use kmemdup() instead of kmalloc() and memcpy()

On Sat, Apr 27, 2024 at 12:00:47AM +0200, Thorsten Blum wrote:
> Fixes the following two Coccinelle/coccicheck warnings reported by
> memdup.cocci:
> 
> 	xfs_dir2.c:343:15-22: WARNING opportunity for kmemdup
> 	xfs_attr_leaf.c:1062:13-20: WARNING opportunity for kmemdup
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@...lux.com>
> ---
>  fs/xfs/libxfs/xfs_attr_leaf.c | 5 ++---
>  fs/xfs/libxfs/xfs_dir2.c      | 3 +--
>  2 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
> index ac904cc1a97b..7346ee9aa4ca 100644
> --- a/fs/xfs/libxfs/xfs_attr_leaf.c
> +++ b/fs/xfs/libxfs/xfs_attr_leaf.c
> @@ -1059,12 +1059,11 @@ xfs_attr3_leaf_to_shortform(
>  
>  	trace_xfs_attr_leaf_to_sf(args);
>  
> -	tmpbuffer = kmalloc(args->geo->blksize, GFP_KERNEL | __GFP_NOFAIL);
> +	tmpbuffer = kmemdup(bp->b_addr, args->geo->blksize,
> +			GFP_KERNEL | __GFP_NOFAIL);
>  	if (!tmpbuffer)
>  		return -ENOMEM;
>  
> -	memcpy(tmpbuffer, bp->b_addr, args->geo->blksize);
> -

Please read the list before submitting a patch to a function that
already has a different change pending.

--D

>  	leaf = (xfs_attr_leafblock_t *)tmpbuffer;
>  	xfs_attr3_leaf_hdr_from_disk(args->geo, &ichdr, leaf);
>  	entry = xfs_attr3_leaf_entryp(leaf);
> diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c
> index 4821519efad4..3ebb959cdaf0 100644
> --- a/fs/xfs/libxfs/xfs_dir2.c
> +++ b/fs/xfs/libxfs/xfs_dir2.c
> @@ -340,12 +340,11 @@ xfs_dir_cilookup_result(
>  					!(args->op_flags & XFS_DA_OP_CILOOKUP))
>  		return -EEXIST;
>  
> -	args->value = kmalloc(len,
> +	args->value = kmemdup(name, len,
>  			GFP_KERNEL | __GFP_NOLOCKDEP | __GFP_RETRY_MAYFAIL);
>  	if (!args->value)
>  		return -ENOMEM;
>  
> -	memcpy(args->value, name, len);
>  	args->valuelen = len;
>  	return -EEXIST;
>  }
> -- 
> 2.44.0
> 
>