From patchwork Fri Dec 7 13:04:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 1850821 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 8C3C53FC71 for ; Fri, 7 Dec 2012 13:04:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030250Ab2LGNEf (ORCPT ); Fri, 7 Dec 2012 08:04:35 -0500 Received: from fieldses.org ([174.143.236.118]:40931 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030214Ab2LGNEV (ORCPT ); Fri, 7 Dec 2012 08:04:21 -0500 Received: from bfields by fieldses.org with local (Exim 4.76) (envelope-from ) id 1TgxbG-0006gL-K2; Fri, 07 Dec 2012 08:04:18 -0500 Date: Fri, 7 Dec 2012 08:04:18 -0500 From: "J. Bruce Fields" To: Abhijit Pawar Cc: Trond Myklebust , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/4] include/sunrpc: remove obsolete simple_strto Message-ID: <20121207130418.GC17115@fieldses.org> References: <1354881096-23480-1-git-send-email-abhi.c.pawar@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1354881096-23480-1-git-send-email-abhi.c.pawar@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org On Fri, Dec 07, 2012 at 05:21:36PM +0530, Abhijit Pawar wrote: > This patch replace the obsolete simple_strto with kstrto 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 > --- > 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 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 Signed-off-by: J. Bruce Fields --- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; }