[v2] acpi: Use kstrtoul() instead of strtoul()/simple_strtoul()

Commit Message

Guenter Roeck July 28, 2015, 12:32 a.m. UTC

simple_strtoul() is deprecated; replace with kstrtoul() and kstrtouint().
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 <[e-mail]>
---
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(-)

Comments

Moore, Robert July 29, 2015, 5:51 p.m. UTC | #1

> -----Original Message-----
> From: Guenter Roeck [mailto:[e-mail]]
> Sent: Monday, July 27, 2015 5:32 PM
> To: [e-mail]
> Cc: [e-mail]; Moore, Robert; Zheng, Lv; [e-mail];
> [e-mail]; [e-mail]; 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 <[e-mail]>
> ---
> 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-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Guenter Roeck July 29, 2015, 6:38 p.m. UTC | #2

On 07/29/2015 10:51 AM, Moore, Robert wrote:
>
>
>> -----Original Message-----
>> From: Guenter Roeck [mailto:[e-mail]]
>> Sent: Monday, July 27, 2015 5:32 PM
>> To: [e-mail]
>> Cc: [e-mail]; Moore, Robert; Zheng, Lv; [e-mail];
>> [e-mail]; [e-mail]; 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).
>
>
Odd argument, given that kstrtoul() is used already in the acpi code.

Guenter

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Moore, Robert July 29, 2015, 7:33 p.m. UTC | #3

> -----Original Message-----
> From: Guenter Roeck [mailto:[e-mail]]
> Sent: Wednesday, July 29, 2015 11:39 AM
> To: Moore, Robert; [e-mail]
> Cc: [e-mail]; Zheng, Lv; [e-mail]; linux-
> [e-mail]; [e-mail]
> Subject: Re: [PATCH v2] acpi: Use kstrtoul() instead of
> strtoul()/simple_strtoul()
> 
> On 07/29/2015 10:51 AM, Moore, Robert wrote:
> >
> >
> >> -----Original Message-----
> >> From: Guenter Roeck [mailto:[e-mail]]
> >> Sent: Monday, July 27, 2015 5:32 PM
> >> To: [e-mail]
> >> Cc: [e-mail]; Moore, Robert; Zheng, Lv;
> >> [e-mail]; [e-mail];
> >> [e-mail]; 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).
> >
> >
> Odd argument, given that kstrtoul() is used already in the acpi code.

They are not in the os-independent ACPICA code. The ACPI-related drivers are another story, since they are OS-dendent.




> 
> Guenter

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Rafael J. Wysocki July 29, 2015, 7:57 p.m. UTC | #4

Hi Guenter,

On Wed, Jul 29, 2015 at 8:38 PM, Guenter Roeck <[e-mail]> wrote:
> On 07/29/2015 10:51 AM, Moore, Robert wrote:
>>
>>
>>
>>> -----Original Message-----
>>> From: Guenter Roeck [mailto:[e-mail]]
>>> Sent: Monday, July 27, 2015 5:32 PM
>>> To: [e-mail]
>>> Cc: [e-mail]; Moore, Robert; Zheng, Lv;
>>> [e-mail];
>>> [e-mail]; [e-mail]; 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).
>>
>>
> Odd argument, given that kstrtoul() is used already in the acpi code.

Boib is right, the change in sysfs.c is OK, but the one in evgpeinit.c
isn't (this code is automatically generated from the upstream ACPICA
source and manual updates of it are painful).

You might provide a strtoul() wrapper around kstrtoul() instead of its
definition in acpi/platform/aclinux.h, though.

Thanks,
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Guenter Roeck July 29, 2015, 7:58 p.m. UTC | #5

On 07/29/2015 12:33 PM, Moore, Robert wrote:
>> -----Original Message-----
>> From: Guenter Roeck [mailto:[e-mail]]
>> Sent: Wednesday, July 29, 2015 11:39 AM
>> To: Moore, Robert; [e-mail]
>> Cc: [e-mail]; Zheng, Lv; [e-mail]; linux-
>> [e-mail]; [e-mail]
>> Subject: Re: [PATCH v2] acpi: Use kstrtoul() instead of
>> strtoul()/simple_strtoul()
>>
>> On 07/29/2015 10:51 AM, Moore, Robert wrote:
>>>
>>>
>>>> -----Original Message-----
>>>> From: Guenter Roeck [mailto:[e-mail]]
>>>> Sent: Monday, July 27, 2015 5:32 PM
>>>> To: [e-mail]
>>>> Cc: [e-mail]; Moore, Robert; Zheng, Lv;
>>>> [e-mail]; [e-mail];
>>>> [e-mail]; 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).
>>>
>>>
>> Odd argument, given that kstrtoul() is used already in the acpi code.
>
> They are not in the os-independent ACPICA code. The ACPI-related drivers are another story, since they are OS-dendent.
>

That this OS independent code mandates functions such as strtoul(),
which may not exist in a target OS, and that it maps strtoul() to
simple_strtoul() in a global include file, doesn't seem to be
correct either and is asking for repeated trouble. I would have
hoped that at the very least such mappings would be implemented
in local include files.

On the other side, my patch to remove the second global definition
of strtoul has been accepted, so the problem I was trying to solve
has been addressed elsewhere. With that, my patch is no longer needed
at this time, at least until someone else redefines strtoul().

Thanks,
Guenter

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Rafael J. Wysocki July 29, 2015, 8:04 p.m. UTC | #6

Hi Guenter,

On Wed, Jul 29, 2015 at 9:58 PM, Guenter Roeck <[e-mail]> wrote:
> On 07/29/2015 12:33 PM, Moore, Robert wrote:
>>>
>>> -----Original Message-----
>>> From: Guenter Roeck [mailto:[e-mail]]
>>> Sent: Wednesday, July 29, 2015 11:39 AM
>>> To: Moore, Robert; [e-mail]
>>> Cc: [e-mail]; Zheng, Lv; [e-mail]; linux-
>>> [e-mail]; [e-mail]
>>> Subject: Re: [PATCH v2] acpi: Use kstrtoul() instead of
>>> strtoul()/simple_strtoul()
>>>
>>> On 07/29/2015 10:51 AM, Moore, Robert wrote:
>>>>
>>>>
>>>>
>>>>> -----Original Message-----
>>>>> From: Guenter Roeck [mailto:[e-mail]]
>>>>> Sent: Monday, July 27, 2015 5:32 PM
>>>>> To: [e-mail]
>>>>> Cc: [e-mail]; Moore, Robert; Zheng, Lv;
>>>>> [e-mail]; [e-mail];
>>>>> [e-mail]; 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).
>>>>
>>>>
>>>>
>>> Odd argument, given that kstrtoul() is used already in the acpi code.
>>
>>
>> They are not in the os-independent ACPICA code. The ACPI-related drivers
>> are another story, since they are OS-dendent.
>>
>
> That this OS independent code mandates functions such as strtoul(),
> which may not exist in a target OS, and that it maps strtoul() to
> simple_strtoul() in a global include file, doesn't seem to be
> correct either and is asking for repeated trouble. I would have
> hoped that at the very least such mappings would be implemented
> in local include files.

The header is obviously OS-dependent and it does what it does just
because simple_strtoul() is available and serves the purpose.

As I said in the previous message, the strtoul() used by ACPICA might
be redefined in terms of kstroul().

And the change in sysfs.c is still OK.  Do you want me to apply this
change only?

Thanks,
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Guenter Roeck July 29, 2015, 8:37 p.m. UTC | #7

On 07/29/2015 01:04 PM, Rafael J. Wysocki wrote:
> Hi Guenter,
>
> On Wed, Jul 29, 2015 at 9:58 PM, Guenter Roeck <[e-mail]> wrote:
>> On 07/29/2015 12:33 PM, Moore, Robert wrote:
>>>>
>>>> -----Original Message-----
>>>> From: Guenter Roeck [mailto:[e-mail]]
>>>> Sent: Wednesday, July 29, 2015 11:39 AM
>>>> To: Moore, Robert; [e-mail]
>>>> Cc: [e-mail]; Zheng, Lv; [e-mail]; linux-
>>>> [e-mail]; [e-mail]
>>>> Subject: Re: [PATCH v2] acpi: Use kstrtoul() instead of
>>>> strtoul()/simple_strtoul()
>>>>
>>>> On 07/29/2015 10:51 AM, Moore, Robert wrote:
>>>>>
>>>>>
>>>>>
>>>>>> -----Original Message-----
>>>>>> From: Guenter Roeck [mailto:[e-mail]]
>>>>>> Sent: Monday, July 27, 2015 5:32 PM
>>>>>> To: [e-mail]
>>>>>> Cc: [e-mail]; Moore, Robert; Zheng, Lv;
>>>>>> [e-mail]; [e-mail];
>>>>>> [e-mail]; 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).
>>>>>
>>>>>
>>>>>
>>>> Odd argument, given that kstrtoul() is used already in the acpi code.
>>>
>>>
>>> They are not in the os-independent ACPICA code. The ACPI-related drivers
>>> are another story, since they are OS-dendent.
>>>
>>
>> That this OS independent code mandates functions such as strtoul(),
>> which may not exist in a target OS, and that it maps strtoul() to
>> simple_strtoul() in a global include file, doesn't seem to be
>> correct either and is asking for repeated trouble. I would have
>> hoped that at the very least such mappings would be implemented
>> in local include files.
>
> The header is obviously OS-dependent and it does what it does just
> because simple_strtoul() is available and serves the purpose.
>
> As I said in the previous message, the strtoul() used by ACPICA might
> be redefined in terms of kstroul().
>
> And the change in sysfs.c is still OK.  Do you want me to apply this
> change only?
>

Let's step back a bit. The problem I was trying to solve was that
there were two definitions of strtoul(), which caused compile errors
for some builds.

libcfs_string.h 105 #define strtoul(str, endp, base) simple_strtoul(str, endp, base)
aclinux.h       122 #define strtoul simple_strtoul

The first was in lustre code. My patch to remove that definition
has been accepted, so now there is only one such definition left.

Fixing the sysfs code only might make some sense - I'll leave that
up to you - but it doesn't address the problem I was trying to solve,
which is that strtoul() is defined in a global but driver specific include
file (include/linux/...). That definition would still be there and may
cause trouble again if someone else defines strtoul elsewhere for similar
reasons.

A fix might be to move the definition of strtoul from aclinux.h to
some include file in drivers/acpi, but I don't know the code well
enough to know if that is even feasible, or which file to move it to.

Thanks,
Guenter

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Pavel Machek Aug. 2, 2015, 7:16 a.m. UTC | #8

On Mon 2015-07-27 17:32:22, Guenter Roeck wrote:
> simple_strtoul() is deprecated; replace with kstrtoul() and kstrtouint().
> 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 <[e-mail]>
> ---
> 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) {

Are you sure you compile-tested this?


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

Guenter Roeck Aug. 2, 2015, 8:19 a.m. UTC | #9

On 08/02/2015 12:16 AM, Pavel Machek wrote:
> On Mon 2015-07-27 17:32:22, Guenter Roeck wrote:
>> simple_strtoul() is deprecated; replace with kstrtoul() and kstrtouint().
>> 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 <[e-mail]>
>> ---
>> 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) {
>
> Are you sure you compile-tested this?
>

I was, but maybe not ;-). Since the patch was rejected it does not really matter.

Guenter

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Moore, Robert Nov. 6, 2015, 4:21 p.m. UTC | #10

> Subject: Re: [PATCH v2] acpi: Use kstrtoul() instead of
> strtoul()/simple_strtoul()

So, this would fix the issue(s) (in aclinux.h):

#define strtoul                     kstrtoul



strtoul is used frequently in with the ACPICA in-kernel AML Debugger:

dbcmds.c(188):        Address = strtoul (InString, NULL, 16);
dbcmds.c(266):    SleepState = (UINT8) strtoul (ObjectArg, NULL, 0);
dbcmds.c(1283):    GpeNumber = strtoul (GpeArg, NULL, 0);
dbcmds.c(1291):        BlockNumber = strtoul (BlockArg, NULL, 0);
dbdisply.c(213):    Address = strtoul (Target, NULL, 16);
dbdisply.c(749):    Handle = ACPI_TO_POINTER (strtoul (ObjectArg, NULL, 16));
dbexec.c(769):    NumThreads = strtoul (NumThreadsArg, NULL, 0);
dbexec.c(770):    NumLoops = strtoul (NumLoopsArg, NULL, 0);
dbhistry.c(292):        CmdNum = strtoul (CommandNumArg, NULL, 0);
dbinput.c(1018):                strtoul (AcpiGbl_DbArgs[1], NULL, 16);
dbinput.c(1026):            AcpiGbl_DbDebugLevel = strtoul (AcpiGbl_DbArgs[1], NULL, 16);
dbinput.c(1060):        Temp = strtoul (AcpiGbl_DbArgs[2], NULL, 0);
dbmethod.c(162):    Address = strtoul (Location, NULL, 16);
dbmethod.c(249):    Value = strtoul (ValueArg, NULL, 16);
dbmethod.c(271):    Index = strtoul (IndexArg, NULL, 16);
dbmethod.c(381):        NumStatements = strtoul (Statements, NULL, 0);
dbnames.c(334):            MaxDepth = strtoul (DepthArg, NULL, 0);
dbnames.c(405):    OwnerId = (ACPI_OWNER_ID) strtoul (OwnerArg, NULL, 0);
dbnames.c(411):        MaxDepth = strtoul (DepthArg, NULL, 0);
dbnames.c(990):    Address = strtoul (ObjectArg, NULL, 16);
dbtest.c(1046):        Info.MaxCount = strtoul (CountArg, NULL, 0);






> -----Original Message-----
> From: Guenter Roeck [mailto:[e-mail]]
> Sent: Sunday, August 02, 2015 1:19 AM
> To: Pavel Machek
> Cc: [e-mail]; [e-mail]; Moore, Robert; Zheng, Lv; linux-
> [e-mail]; [e-mail]; [e-mail]
> Subject: Re: [PATCH v2] acpi: Use kstrtoul() instead of
> strtoul()/simple_strtoul()
> 
> On 08/02/2015 12:16 AM, Pavel Machek wrote:
> > On Mon 2015-07-27 17:32:22, Guenter Roeck wrote:
> >> simple_strtoul() is deprecated; replace with kstrtoul() and
> kstrtouint().
> >> 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 <[e-mail]>
> >> ---
> >> 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) {
> >
> > Are you sure you compile-tested this?
> >
> 
> I was, but maybe not ;-). Since the patch was rejected it does not really
> matter.
> 
> Guenter

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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 *