subject:"\[PATCH\] lib\/kstrtox.c break if overflow is detected"

Re: [PATCH] lib/kstrtox.c break if overflow is detected

2015-01-22 Thread Anshul Garg

Dear Mr. Levente ,


Thanks for the reply.

I will segregate this patch in two different patches.

I will send these patches again.


Thanks
Anshul Garg



On Thu, Jan 22, 2015 at 1:09 AM, Levente Kurusa  wrote:
> Hi,
>
> On Wed, Jan 21, 2015 at 11:26:26AM -0800, Anshul Garg wrote:
>> From: Anshul Garg 
>>
>> 1. While converting string representation to integer
>> break the loop if overflow is detected.
>> 2. Clean kstrtoll function
>>
>> Signed-off-by: Anshul Garg 
>> ---
>>  lib/kstrtox.c |   28 +---
>>  1 file changed, 13 insertions(+), 15 deletions(-)
>>
>> diff --git a/lib/kstrtox.c b/lib/kstrtox.c
>> index ec8da78..8cbe5ca 100644
>> --- a/lib/kstrtox.c
>> +++ b/lib/kstrtox.c
>> @@ -70,8 +70,10 @@ unsigned int _parse_integer(const char *s, unsigned int 
>> base, unsigned long long
>>* it in the max base we support (16)
>>*/
>>   if (unlikely(res & (~0ull << 60))) {
>> - if (res > div_u64(ULLONG_MAX - val, base))
>> + if (res > div_u64(ULLONG_MAX - val, base)) {
>>   overflow = 1;
>> + break;
>> + }
>>   }
>>   res = res * base + val;
>>   rv++;
>> @@ -146,23 +148,19 @@ EXPORT_SYMBOL(kstrtoull);
>>  int kstrtoll(const char *s, unsigned int base, long long *res)
>>  {
>>   unsigned long long tmp;
>> - int rv;
>> + int rv, sign = 1;
>>
>>   if (s[0] == '-') {
>> - rv = _kstrtoull(s + 1, base, );
>> - if (rv < 0)
>> - return rv;
>> - if ((long long)(-tmp) >= 0)
>> - return -ERANGE;
>> - *res = -tmp;
>> - } else {
>> - rv = kstrtoull(s, base, );
>> - if (rv < 0)
>> - return rv;
>> - if ((long long)tmp < 0)
>> - return -ERANGE;
>> - *res = tmp;
>> + sign = -1;
>> + s++;
>>   }
>> +
>> + rv = kstrtoull(s, base, );
>> + if (rv < 0)
>> + return rv;
>> + if ((long long)tmp < 0)
>> + return -ERANGE;
>> + *res = sign * tmp;
>>   return 0;
>>  }
>>  EXPORT_SYMBOL(kstrtoll);
>
> Looks correct to me, so:
>
> Reviewed-by: Levente Kurusa 
>
> But I believe the two hunks are completely unrelated to
> eachother and hence should split into a patch series.
>
> Could you please do that and resend? Or if Andrew is OK
> with picking it up as is, then it's fine.
>
> Thanks,
> Levente.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] lib/kstrtox.c break if overflow is detected

2015-01-22 Thread Anshul Garg

Dear Mr. Levente ,


Thanks for the reply.

I will segregate this patch in two different patches.

I will send these patches again.


Thanks
Anshul Garg



On Thu, Jan 22, 2015 at 1:09 AM, Levente Kurusa le...@linux.com wrote:
 Hi,

 On Wed, Jan 21, 2015 at 11:26:26AM -0800, Anshul Garg wrote:
 From: Anshul Garg aksgarg1...@gmail.com

 1. While converting string representation to integer
 break the loop if overflow is detected.
 2. Clean kstrtoll function

 Signed-off-by: Anshul Garg aksgarg1...@gmail.com
 ---
  lib/kstrtox.c |   28 +---
  1 file changed, 13 insertions(+), 15 deletions(-)

 diff --git a/lib/kstrtox.c b/lib/kstrtox.c
 index ec8da78..8cbe5ca 100644
 --- a/lib/kstrtox.c
 +++ b/lib/kstrtox.c
 @@ -70,8 +70,10 @@ unsigned int _parse_integer(const char *s, unsigned int 
 base, unsigned long long
* it in the max base we support (16)
*/
   if (unlikely(res  (~0ull  60))) {
 - if (res  div_u64(ULLONG_MAX - val, base))
 + if (res  div_u64(ULLONG_MAX - val, base)) {
   overflow = 1;
 + break;
 + }
   }
   res = res * base + val;
   rv++;
 @@ -146,23 +148,19 @@ EXPORT_SYMBOL(kstrtoull);
  int kstrtoll(const char *s, unsigned int base, long long *res)
  {
   unsigned long long tmp;
 - int rv;
 + int rv, sign = 1;

   if (s[0] == '-') {
 - rv = _kstrtoull(s + 1, base, tmp);
 - if (rv  0)
 - return rv;
 - if ((long long)(-tmp) = 0)
 - return -ERANGE;
 - *res = -tmp;
 - } else {
 - rv = kstrtoull(s, base, tmp);
 - if (rv  0)
 - return rv;
 - if ((long long)tmp  0)
 - return -ERANGE;
 - *res = tmp;
 + sign = -1;
 + s++;
   }
 +
 + rv = kstrtoull(s, base, tmp);
 + if (rv  0)
 + return rv;
 + if ((long long)tmp  0)
 + return -ERANGE;
 + *res = sign * tmp;
   return 0;
  }
  EXPORT_SYMBOL(kstrtoll);

 Looks correct to me, so:

 Reviewed-by: Levente Kurusa le...@linux.com

 But I believe the two hunks are completely unrelated to
 eachother and hence should split into a patch series.

 Could you please do that and resend? Or if Andrew is OK
 with picking it up as is, then it's fine.

 Thanks,
 Levente.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] lib/kstrtox.c break if overflow is detected

2015-01-21 Thread Levente Kurusa

Hi,

On Wed, Jan 21, 2015 at 11:26:26AM -0800, Anshul Garg wrote:
> From: Anshul Garg 
> 
> 1. While converting string representation to integer
> break the loop if overflow is detected.
> 2. Clean kstrtoll function
> 
> Signed-off-by: Anshul Garg 
> ---
>  lib/kstrtox.c |   28 +---
>  1 file changed, 13 insertions(+), 15 deletions(-)
> 
> diff --git a/lib/kstrtox.c b/lib/kstrtox.c
> index ec8da78..8cbe5ca 100644
> --- a/lib/kstrtox.c
> +++ b/lib/kstrtox.c
> @@ -70,8 +70,10 @@ unsigned int _parse_integer(const char *s, unsigned int 
> base, unsigned long long
>* it in the max base we support (16)
>*/
>   if (unlikely(res & (~0ull << 60))) {
> - if (res > div_u64(ULLONG_MAX - val, base))
> + if (res > div_u64(ULLONG_MAX - val, base)) {
>   overflow = 1;
> + break;
> + }
>   }
>   res = res * base + val;
>   rv++;
> @@ -146,23 +148,19 @@ EXPORT_SYMBOL(kstrtoull);
>  int kstrtoll(const char *s, unsigned int base, long long *res)
>  {
>   unsigned long long tmp;
> - int rv;
> + int rv, sign = 1;
>  
>   if (s[0] == '-') {
> - rv = _kstrtoull(s + 1, base, );
> - if (rv < 0)
> - return rv;
> - if ((long long)(-tmp) >= 0)
> - return -ERANGE;
> - *res = -tmp;
> - } else {
> - rv = kstrtoull(s, base, );
> - if (rv < 0)
> - return rv;
> - if ((long long)tmp < 0)
> - return -ERANGE;
> - *res = tmp;
> + sign = -1;
> + s++;
>   }
> +
> + rv = kstrtoull(s, base, );
> + if (rv < 0)
> + return rv;
> + if ((long long)tmp < 0)
> + return -ERANGE;
> + *res = sign * tmp;
>   return 0;
>  }
>  EXPORT_SYMBOL(kstrtoll);

Looks correct to me, so:

Reviewed-by: Levente Kurusa 

But I believe the two hunks are completely unrelated to
eachother and hence should split into a patch series.

Could you please do that and resend? Or if Andrew is OK
with picking it up as is, then it's fine.

Thanks,
Levente.


signature.asc
Description: Digital signature

[PATCH] lib/kstrtox.c break if overflow is detected

2015-01-21 Thread Anshul Garg

From: Anshul Garg 

1. While converting string representation to integer
break the loop if overflow is detected.
2. Clean kstrtoll function

Signed-off-by: Anshul Garg 
---
 lib/kstrtox.c |   28 +---
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index ec8da78..8cbe5ca 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -70,8 +70,10 @@ unsigned int _parse_integer(const char *s, unsigned int 
base, unsigned long long
 * it in the max base we support (16)
 */
if (unlikely(res & (~0ull << 60))) {
-   if (res > div_u64(ULLONG_MAX - val, base))
+   if (res > div_u64(ULLONG_MAX - val, base)) {
overflow = 1;
+   break;
+   }
}
res = res * base + val;
rv++;
@@ -146,23 +148,19 @@ EXPORT_SYMBOL(kstrtoull);
 int kstrtoll(const char *s, unsigned int base, long long *res)
 {
unsigned long long tmp;
-   int rv;
+   int rv, sign = 1;
 
if (s[0] == '-') {
-   rv = _kstrtoull(s + 1, base, );
-   if (rv < 0)
-   return rv;
-   if ((long long)(-tmp) >= 0)
-   return -ERANGE;
-   *res = -tmp;
-   } else {
-   rv = kstrtoull(s, base, );
-   if (rv < 0)
-   return rv;
-   if ((long long)tmp < 0)
-   return -ERANGE;
-   *res = tmp;
+   sign = -1;
+   s++;
}
+
+   rv = kstrtoull(s, base, );
+   if (rv < 0)
+   return rv;
+   if ((long long)tmp < 0)
+   return -ERANGE;
+   *res = sign * tmp;
return 0;
 }
 EXPORT_SYMBOL(kstrtoll);
-- 
1.7.9.5


---
This email has been checked for viruses by Avast antivirus software.
http://www.avast.com

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] lib/kstrtox.c break if overflow is detected

2015-01-21 Thread Levente Kurusa

Hi,

On Wed, Jan 21, 2015 at 11:26:26AM -0800, Anshul Garg wrote:
 From: Anshul Garg aksgarg1...@gmail.com
 
 1. While converting string representation to integer
 break the loop if overflow is detected.
 2. Clean kstrtoll function
 
 Signed-off-by: Anshul Garg aksgarg1...@gmail.com
 ---
  lib/kstrtox.c |   28 +---
  1 file changed, 13 insertions(+), 15 deletions(-)
 
 diff --git a/lib/kstrtox.c b/lib/kstrtox.c
 index ec8da78..8cbe5ca 100644
 --- a/lib/kstrtox.c
 +++ b/lib/kstrtox.c
 @@ -70,8 +70,10 @@ unsigned int _parse_integer(const char *s, unsigned int 
 base, unsigned long long
* it in the max base we support (16)
*/
   if (unlikely(res  (~0ull  60))) {
 - if (res  div_u64(ULLONG_MAX - val, base))
 + if (res  div_u64(ULLONG_MAX - val, base)) {
   overflow = 1;
 + break;
 + }
   }
   res = res * base + val;
   rv++;
 @@ -146,23 +148,19 @@ EXPORT_SYMBOL(kstrtoull);
  int kstrtoll(const char *s, unsigned int base, long long *res)
  {
   unsigned long long tmp;
 - int rv;
 + int rv, sign = 1;
  
   if (s[0] == '-') {
 - rv = _kstrtoull(s + 1, base, tmp);
 - if (rv  0)
 - return rv;
 - if ((long long)(-tmp) = 0)
 - return -ERANGE;
 - *res = -tmp;
 - } else {
 - rv = kstrtoull(s, base, tmp);
 - if (rv  0)
 - return rv;
 - if ((long long)tmp  0)
 - return -ERANGE;
 - *res = tmp;
 + sign = -1;
 + s++;
   }
 +
 + rv = kstrtoull(s, base, tmp);
 + if (rv  0)
 + return rv;
 + if ((long long)tmp  0)
 + return -ERANGE;
 + *res = sign * tmp;
   return 0;
  }
  EXPORT_SYMBOL(kstrtoll);

Looks correct to me, so:

Reviewed-by: Levente Kurusa le...@linux.com

But I believe the two hunks are completely unrelated to
eachother and hence should split into a patch series.

Could you please do that and resend? Or if Andrew is OK
with picking it up as is, then it's fine.

Thanks,
Levente.


signature.asc
Description: Digital signature

[PATCH] lib/kstrtox.c break if overflow is detected

2015-01-21 Thread Anshul Garg

From: Anshul Garg aksgarg1...@gmail.com

1. While converting string representation to integer
break the loop if overflow is detected.
2. Clean kstrtoll function

Signed-off-by: Anshul Garg aksgarg1...@gmail.com
---
 lib/kstrtox.c |   28 +---
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index ec8da78..8cbe5ca 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -70,8 +70,10 @@ unsigned int _parse_integer(const char *s, unsigned int 
base, unsigned long long
 * it in the max base we support (16)
 */
if (unlikely(res  (~0ull  60))) {
-   if (res  div_u64(ULLONG_MAX - val, base))
+   if (res  div_u64(ULLONG_MAX - val, base)) {
overflow = 1;
+   break;
+   }
}
res = res * base + val;
rv++;
@@ -146,23 +148,19 @@ EXPORT_SYMBOL(kstrtoull);
 int kstrtoll(const char *s, unsigned int base, long long *res)
 {
unsigned long long tmp;
-   int rv;
+   int rv, sign = 1;
 
if (s[0] == '-') {
-   rv = _kstrtoull(s + 1, base, tmp);
-   if (rv  0)
-   return rv;
-   if ((long long)(-tmp) = 0)
-   return -ERANGE;
-   *res = -tmp;
-   } else {
-   rv = kstrtoull(s, base, tmp);
-   if (rv  0)
-   return rv;
-   if ((long long)tmp  0)
-   return -ERANGE;
-   *res = tmp;
+   sign = -1;
+   s++;
}
+
+   rv = kstrtoull(s, base, tmp);
+   if (rv  0)
+   return rv;
+   if ((long long)tmp  0)
+   return -ERANGE;
+   *res = sign * tmp;
return 0;
 }
 EXPORT_SYMBOL(kstrtoll);
-- 
1.7.9.5


---
This email has been checked for viruses by Avast antivirus software.
http://www.avast.com

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] lib/kstrtox.c break if overflow is detected

Re: [PATCH] lib/kstrtox.c break if overflow is detected

Re: [PATCH] lib/kstrtox.c break if overflow is detected

[PATCH] lib/kstrtox.c break if overflow is detected

Re: [PATCH] lib/kstrtox.c break if overflow is detected

[PATCH] lib/kstrtox.c break if overflow is detected

6 matches

Site Navigation

Mail list logo

Footer information