linux-kernel - RE: [PATCH v2] acpi: Use kstrtoul() instead of strtoul()/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] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 29 Jul 2015 17:51:20 +0000
From:	"Moore, Robert" <robert.moore@...el.com>
To:	Guenter Roeck <linux@...ck-us.net>,
	"rjw@...ysocki.net" <rjw@...ysocki.net>
CC:	"lenb@...nel.org" <lenb@...nel.org>,
	"Zheng, Lv" <lv.zheng@...el.com>,
	"linux-acpi@...r.kernel.org" <linux-acpi@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"devel@...ica.org" <devel@...ica.org>
Subject: RE: [PATCH v2] acpi: Use kstrtoul() instead of
 strtoul()/simple_strtoul()



> -----Original Message-----
> From: Guenter Roeck [mailto:linux@...ck-us.net]
> Sent: Monday, July 27, 2015 5:32 PM
> To: rjw@...ysocki.net
> Cc: lenb@...nel.org; Moore, Robert; Zheng, Lv; linux-acpi@...r.kernel.org;
> linux-kernel@...r.kernel.org; devel@...ica.org; Guenter Roeck
> Subject: [PATCH v2] acpi: Use kstrtoul() instead of
> strtoul()/simple_strtoul()
> 
> simple_strtoul() is deprecated; replace with kstrtoul() and kstrtouint().

The ACPICA code is os-independent and cannot use these functions (at least not directly).





> Return an error if the value passed to the sysfs attribute is not a
> number.
> 
> Drop the definition of strtoul() since it is no longer needed.
> 
> Signed-off-by: Guenter Roeck <linux@...ck-us.net>
> ---
> v2: An additional use of strtoul() was introduced with commit 4fa4616e.
>     Replace it as well.
> 
>  drivers/acpi/acpica/evgpeinit.c | 5 +++--
>  drivers/acpi/sysfs.c            | 8 ++++++--
>  include/acpi/platform/aclinux.h | 1 -
>  3 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/acpi/acpica/evgpeinit.c
> b/drivers/acpi/acpica/evgpeinit.c index ea4c0d3fca2d..aa1e8c1f2d4a 100644
> --- a/drivers/acpi/acpica/evgpeinit.c
> +++ b/drivers/acpi/acpica/evgpeinit.c
> @@ -326,6 +326,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
>  	u32 gpe_number;
>  	char name[ACPI_NAME_SIZE + 1];
>  	u8 type;
> +	int err;
> 
>  	ACPI_FUNCTION_TRACE(ev_match_gpe_method);
> 
> @@ -377,8 +378,8 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
> 
>  	/* 4) The last two characters of the name are the hex GPE Number */
> 
> -	gpe_number = strtoul(&name[2], NULL, 16);
> -	if (gpe_number == ACPI_UINT32_MAX) {
> +	er = kstrtouint(&name[2], 16, &gpe_number);
> +	if (err < 0 || gpe_number == ACPI_UINT32_MAX) {
> 
>  		/* Conversion failed; invalid method, just ignore it */
> 
> diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index
> 0876d77b3206..d6ea5712ec57 100644
> --- a/drivers/acpi/sysfs.c
> +++ b/drivers/acpi/sysfs.c
> @@ -616,8 +616,12 @@ static ssize_t counter_set(struct kobject *kobj,
>  			all_counters[index].count = tmp;
>  		else
>  			result = -EINVAL;
> -	} else
> -		all_counters[index].count = strtoul(buf, NULL, 0);
> +	} else {
> +		if (!kstrtoul(buf, 0, &tmp))
> +			all_counters[index].count = tmp;
> +		else
> +			result = -EINVAL;
> +	}
> 
>  	if (ACPI_FAILURE(result))
>  		result = -EINVAL;
> diff --git a/include/acpi/platform/aclinux.h
> b/include/acpi/platform/aclinux.h index 74ba46c8157a..9925c1d5d58f 100644
> --- a/include/acpi/platform/aclinux.h
> +++ b/include/acpi/platform/aclinux.h
> @@ -119,7 +119,6 @@
> 
>  #define ACPI_MACHINE_WIDTH          BITS_PER_LONG
>  #define ACPI_EXPORT_SYMBOL(symbol)  EXPORT_SYMBOL(symbol);
> -#define strtoul                     simple_strtoul
> 
>  #define acpi_cache_t                        struct kmem_cache
>  #define acpi_spinlock                       spinlock_t *
> --
> 2.1.0

--
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/