netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iproute2: lib/utils.c bug fixes
@ 2013-04-12  2:30 Mr Dash Four
  2013-04-12  3:06 ` Stephen Hemminger
  0 siblings, 1 reply; 18+ messages in thread
From: Mr Dash Four @ 2013-04-12  2:30 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

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;

^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2013-04-12 20:36 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-12  2:30 [PATCH] iproute2: lib/utils.c bug fixes Mr Dash Four
2013-04-12  3:06 ` 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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).