* Re: [PATCH 3/4] include/sunrpc: remove obsolete simple_strto<foo>
2012-12-07 11:51 [PATCH 3/4] include/sunrpc: remove obsolete simple_strto<foo> Abhijit Pawar
@ 2012-12-07 13:04 ` J. Bruce Fields
0 siblings, 0 replies; 2+ messages in thread
From: J. Bruce Fields @ 2012-12-07 13:04 UTC (permalink / raw)
To: Abhijit Pawar; +Cc: Trond Myklebust, linux-nfs, linux-kernel
On Fri, Dec 07, 2012 at 05:21:36PM +0530, Abhijit Pawar wrote:
> This patch replace the obsolete simple_strto<foo> with kstrto<foo>
No, we can't apply this as is--see the recent revert of a similar
change, below.
kstrtoint does not have the same behavior as simple_strtol, so don't
blindly replace one by the other. At a bare minimum the changelog
should have a note about the differences to help maintainers determine
if the change will cause problems.
--b.
> Signed-off-by: Abhijit Pawar <abhi.c.pawar@gmail.com>
> ---
> include/linux/sunrpc/cache.h | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
> index 5dc9ee4..96d2545 100644
> --- a/include/linux/sunrpc/cache.h
> +++ b/include/linux/sunrpc/cache.h
> @@ -218,7 +218,7 @@ static inline int get_int(char **bpp, int *anint)
> {
> char buf[50];
> char *ep;
> - int rv;
> + int rv, rc;
> int len = qword_get(bpp, buf, sizeof(buf));
>
> if (len < 0)
> @@ -226,8 +226,8 @@ static inline int get_int(char **bpp, int *anint)
> if (len == 0)
> return -ENOENT;
>
> - rv = simple_strtol(buf, &ep, 0);
> - if (*ep)
> + rc = kstrtoint(buf, 0, &rv);
> + if (rc)
> return -EINVAL;
>
> *anint = rv;
commit 621eb19ce1ec216e03ad354cb0c4061736b2a436
Author: J. Bruce Fields <bfields@redhat.com>
Date: Wed Nov 14 10:48:05 2012 -0500
svcrpc: Revert "sunrpc/cache.h: replace simple_strtoul"
Commit bbf43dc888833ac0539e437dbaeb28bfd4fbab9f "sunrpc/cache.h: replace
simple_strtoul" introduced new range-checking which could cause get_int
to fail on unsigned integers too large to be represented as an int.
We could parse them as unsigned instead--but it turns out svcgssd is
actually passing down "-1" in some cases. Which is perhaps stupid, but
there's nothing we can do about it now.
So just revert back to the previous "sloppy" behavior that accepts
either representation.
Cc: stable@vger.kernel.org
Reported-by: Sven Geggus <lists@fuchsschwanzdomain.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index f792794..5dc9ee4 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -217,6 +217,8 @@ extern int qword_get(char **bpp, char *dest, int bufsize);
static inline int get_int(char **bpp, int *anint)
{
char buf[50];
+ char *ep;
+ int rv;
int len = qword_get(bpp, buf, sizeof(buf));
if (len < 0)
@@ -224,9 +226,11 @@ static inline int get_int(char **bpp, int *anint)
if (len == 0)
return -ENOENT;
- if (kstrtoint(buf, 0, anint))
+ rv = simple_strtol(buf, &ep, 0);
+ if (*ep)
return -EINVAL;
+ *anint = rv;
return 0;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread