From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Kirsher Subject: [ethtool PATCH] ethtool: Can't parse ints with stroul() Date: Tue, 08 Dec 2009 09:32:40 -0800 Message-ID: <20091208173240.19917.99052.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, gospo@redhat.com, Peter P Waskiewicz Jr , Jeff Kirsher To: jeff@garzik.org, davem@davemloft.net Return-path: Received: from qmta06.westchester.pa.mail.comcast.net ([76.96.62.56]:33505 "EHLO QMTA06.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937077AbZLHRcx (ORCPT ); Tue, 8 Dec 2009 12:32:53 -0500 Sender: netdev-owner@vger.kernel.org List-ID: From: PJ Waskiewicz A recent change to how int's were being parsed from the command line had them being read in with an unsigned int string operator. This didn't allow signed numbers from being read in correctly. This patch adds a get_uint() routine, and fixes the get_int() routine to read in signed values. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher --- ethtool.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/ethtool.c b/ethtool.c index 10dfc80..415ee77 100644 --- a/ethtool.c +++ b/ethtool.c @@ -324,6 +324,7 @@ typedef enum { CMDL_NONE, CMDL_BOOL, CMDL_INT, + CMDL_UINT, CMDL_STR, } cmdline_type_t; @@ -404,6 +405,20 @@ static struct cmdline_info cmdline_coalesce[] = { static int get_int(char *str, int base) { + long v; + char *endp; + + if (!str) + show_usage(1); + errno = 0; + v = strtol(str, &endp, base); + if ( errno || *endp || v > INT_MAX) + show_usage(1); + return (int)v; +} + +static int get_uint(char *str, int base) +{ unsigned long v; char *endp; @@ -413,7 +428,7 @@ static int get_int(char *str, int base) v = strtoul(str, &endp, base); if ( errno || *endp || v > INT_MAX) show_usage(1); - return (int)v; + return v; } static void parse_generic_cmdline(int argc, char **argp, @@ -447,6 +462,10 @@ static void parse_generic_cmdline(int argc, char **argp, *p = get_int(argp[i],0); break; } + case CMDL_UINT: { + *p = get_uint(argp[i],0); + break; + } case CMDL_STR: { char **s = info[idx].wanted_val; *s = strdup(argp[i]);