linux-kernel - Re: [PATCH v3] ocfs2: heartbeat: replace simple

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: <46e3bfb7-ae28-412e-8996-900f6a2902fc@linux.alibaba.com>
Date: Mon, 18 Nov 2024 09:11:23 +0800
From: Joseph Qi <joseph.qi@...ux.alibaba.com>
To: Daniel Yang <danielyangkang@...il.com>, akpm <akpm@...ux-foundation.org>
Cc: Mark Fasheh <mark@...heh.com>, Joel Becker <jlbec@...lplan.org>,
 "open list:ORACLE CLUSTER FILESYSTEM 2 (OCFS2)"
 <ocfs2-devel@...ts.linux.dev>, open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v3] ocfs2: heartbeat: replace simple_strtoul with kstrtoul



On 11/18/24 5:52 AM, Daniel Yang wrote:
> The function simple_strtoul is deprecated due to ignoring overflows and
> also requires clunkier error checking. Replacing with kstrtoul() leads
> to safer code and cleaner error checking.
> 
> Signed-off-by: Daniel Yang <danielyangkang@...il.com>

Reviewed-by: Joseph Qi <joseph.qi@...ux.alibaba.com>
> ---
> v2->v3: code style change and return ret
> v1->v2: moved ret definition and removed blank lines
> 
>  fs/ocfs2/cluster/heartbeat.c | 21 ++++++++++++---------
>  1 file changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
> index dff18efbc..76f1e7bfd 100644
> --- a/fs/ocfs2/cluster/heartbeat.c
> +++ b/fs/ocfs2/cluster/heartbeat.c
> @@ -1536,10 +1536,11 @@ static int o2hb_read_block_input(struct o2hb_region *reg,
>  {
>  	unsigned long bytes;
>  	char *p = (char *)page;
> +	int ret;
>  
> -	bytes = simple_strtoul(p, &p, 0);
> -	if (!p || (*p && (*p != '\n')))
> -		return -EINVAL;
> +	ret = kstrtoul(p, 0, &bytes);
> +	if (ret)
> +		return ret;
>  
>  	/* Heartbeat and fs min / max block sizes are the same. */
>  	if (bytes > 4096 || bytes < 512)
> @@ -1623,13 +1624,14 @@ static ssize_t o2hb_region_blocks_store(struct config_item *item,
>  	struct o2hb_region *reg = to_o2hb_region(item);
>  	unsigned long tmp;
>  	char *p = (char *)page;
> +	int ret;
>  
>  	if (reg->hr_bdev_file)
>  		return -EINVAL;
>  
> -	tmp = simple_strtoul(p, &p, 0);
> -	if (!p || (*p && (*p != '\n')))
> -		return -EINVAL;
> +	ret = kstrtoul(p, 0, &tmp);
> +	if (ret)
> +		return ret;
>  
>  	if (tmp > O2NM_MAX_NODES || tmp == 0)
>  		return -ERANGE;
> @@ -2141,10 +2143,11 @@ static ssize_t o2hb_heartbeat_group_dead_threshold_store(struct config_item *ite
>  {
>  	unsigned long tmp;
>  	char *p = (char *)page;
> +	int ret;
>  
> -	tmp = simple_strtoul(p, &p, 10);
> -	if (!p || (*p && (*p != '\n')))
> -                return -EINVAL;
> +	ret = kstrtoul(p, 10, &tmp);
> +	if (ret)
> +		return ret;
>  
>  	/* this will validate ranges for us. */
>  	o2hb_dead_threshold_set((unsigned int) tmp);