linux-kernel - Re: [PATCH] drm: modes: replace simple_strtoul by kstrtouint

Open Source and information security mailing list archives

Message-ID: <20151116161548.GA16848@phenom.ffwll.local>
Date:	Mon, 16 Nov 2015 17:15:48 +0100
From:	Daniel Vetter <daniel@...ll.ch>
To:	LABBE Corentin <clabbe.montjoie@...il.com>
Cc:	airlied@...ux.ie, linux-kernel@...r.kernel.org,
	dri-devel@...ts.freedesktop.org
Subject: Re: [PATCH] drm: modes: replace simple_strtoul by kstrtouint

On Thu, Nov 05, 2015 at 10:33:54AM +0100, LABBE Corentin wrote:
> The simple_strtoul function is marked as obsolete.
> This patch replace it by kstrtouint.
> 
> Signed-off-by: LABBE Corentin <clabbe.montjoie@...il.com>

Applied to drm-misc, thanks.
-Daniel

> ---
>  drivers/gpu/drm/drm_modes.c | 16 +++++++++++-----
>  1 file changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
> index cd74a09..bde9b29 100644
> --- a/drivers/gpu/drm/drm_modes.c
> +++ b/drivers/gpu/drm/drm_modes.c
> @@ -1230,7 +1230,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
>  	unsigned int xres = 0, yres = 0, bpp = 32, refresh = 0;
>  	bool yres_specified = false, cvt = false, rb = false;
>  	bool interlace = false, margins = false, was_digit = false;
> -	int i;
> +	int i, err;
>  	enum drm_connector_force force = DRM_FORCE_UNSPECIFIED;
>  
>  #ifdef CONFIG_FB
> @@ -1250,7 +1250,9 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
>  		case '@':
>  			if (!refresh_specified && !bpp_specified &&
>  			    !yres_specified && !cvt && !rb && was_digit) {
> -				refresh = simple_strtol(&name[i+1], NULL, 10);
> +				err = kstrtouint(&name[i + 1], 10, &refresh);
> +				if (err)
> +					return false;
>  				refresh_specified = true;
>  				was_digit = false;
>  			} else
> @@ -1259,7 +1261,9 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
>  		case '-':
>  			if (!bpp_specified && !yres_specified && !cvt &&
>  			    !rb && was_digit) {
> -				bpp = simple_strtol(&name[i+1], NULL, 10);
> +				err = kstrtouint(&name[i + 1], 10, &bpp);
> +				if (err)
> +					return false;
>  				bpp_specified = true;
>  				was_digit = false;
>  			} else
> @@ -1267,7 +1271,9 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
>  			break;
>  		case 'x':
>  			if (!yres_specified && was_digit) {
> -				yres = simple_strtol(&name[i+1], NULL, 10);
> +				err = kstrtouint(&name[i + 1], 10, &yres);
> +				if (err)
> +					return false;
>  				yres_specified = true;
>  				was_digit = false;
>  			} else
> @@ -1491,4 +1497,4 @@ int drm_mode_convert_umode(struct drm_display_mode *out,
>  
>  out:
>  	return ret;
> -}
> \ No newline at end of file
> +}
> -- 
> 2.4.10
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@...ts.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
--
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