All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mr Dash Four <mr.dash.four@googlemail.com>
To: netdev@vger.kernel.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH] iproute2: lib/utils.c bug fixes
Date: Fri, 12 Apr 2013 03:30:45 +0100	[thread overview]
Message-ID: <516771D5.3040607@googlemail.com> (raw)

This patch fixes the following 3 bugs in get_u32/get_u64 functions:

  1. On 32-bit systems, get_u32 could not detect an overflow.
     get_u32(&l, "4294967296", 10) always returned 4294967295
     (ULONG_MAX on 32-bit systems).

  2. get_u64(&ll, "4294967295", 10) was returning an error where
     it shouldn't have (4294967295 is perfectly legitimate value for
     unsigned long long).

  3. get_u64 couldn't detect an overflow errors (arg > ULLONG_MAX)

Signed-off-by: Mr Dash Four <mr.dash.four@googlemail.com>
---
  lib/utils.c |    8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/utils.c b/lib/utils.c
index 5bcdbcf..aeee8f1 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -149,10 +149,12 @@ int get_u64(__u64 *val, const char *arg, int base)
  	unsigned long long res;
  	char *ptr;

+	errno = 0;
+
  	if (!arg || !*arg)
  		return -1;
  	res = strtoull(arg, &ptr, base);
-	if (!ptr || ptr == arg || *ptr || res == 0xFFFFFFFFULL)
+	if (!ptr || ptr == arg || *ptr || (res == ULLONG_MAX && errno == ERANGE))
   		return -1;
   	*val = res;
   	return 0;
@@ -163,10 +165,12 @@ int get_u32(__u32 *val, const char *arg, int base)
  	unsigned long res;
  	char *ptr;

+	errno = 0;
+
  	if (!arg || !*arg)
  		return -1;
  	res = strtoul(arg, &ptr, base);
-	if (!ptr || ptr == arg || *ptr || res > 0xFFFFFFFFUL)
+	if (!ptr || ptr == arg || *ptr || res > 0xFFFFFFFFUL || errno == ERANGE)
  		return -1;
  	*val = res;
  	return 0;

             reply	other threads:[~2013-04-12  2:30 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-12  2:30 Mr Dash Four [this message]
2013-04-12  3:06 ` [PATCH] iproute2: lib/utils.c bug fixes Stephen Hemminger
2013-04-12 13:49   ` Mr Dash Four
2013-04-12 14:25     ` Eric Dumazet
2013-04-12 14:38       ` Mr Dash Four
2013-04-12 15:09         ` Eric Dumazet
2013-04-12 15:25           ` Mr Dash Four
2013-04-12 15:45             ` Eric Dumazet
2013-04-12 16:15               ` Mr Dash Four
2013-04-12 16:21           ` Bjørn Mork
2013-04-12 16:02     ` Stephen Hemminger
2013-04-12 16:16       ` Mr Dash Four
2013-04-12 17:36     ` David Miller
2013-04-12 17:58       ` Mr Dash Four
2013-04-12 18:15         ` David Miller
2013-04-12 18:18         ` Hannes Frederic Sowa
2013-04-12 18:36           ` Mr Dash Four
2013-04-12 20:36             ` Hannes Frederic Sowa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=516771D5.3040607@googlemail.com \
    --to=mr.dash.four@googlemail.com \
    --cc=netdev@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.