From: Denys Fedoryshchenko <denys@visp.net.lb>
Date: Wed, 30 Jul 2008 14:34:07 +0000 (+0300)
Subject: long/ulong iproute-git fix
X-Git-Tag: v2.6.27~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11bbe7fd11d5b39e2a136f9d29acef02ce33bf00;p=thirdparty%2Fiproute2.git

long/ulong iproute-git fix

This patch fixes bug in Metadata ematch attributes parser

strtoul on error return ULONG_MAX, not LONG_MAX

Patch attached as file
---

diff --git a/tc/em_meta.c b/tc/em_meta.c
index f12be7faa..ee6034fb6 100644
--- a/tc/em_meta.c
+++ b/tc/em_meta.c
@@ -262,7 +262,7 @@ parse_object(struct bstr *args, struct bstr *arg, struct tcf_meta_val *obj,
 	}
 
 	num = bstrtoul(arg);
-	if (num != LONG_MAX) {
+	if (num != ULONG_MAX) {
 		obj->kind = TCF_META_TYPE_INT << 12;
 		obj->kind |= TCF_META_ID_VALUE;
 		*dst = (unsigned long) num;
@@ -320,7 +320,7 @@ compatible:
 			a = bstr_next(a);
 
 			shift = bstrtoul(a);
-			if (shift == LONG_MAX) {
+			if (shift == ULONG_MAX) {
 				PARSE_ERR(a, "meta: invalid shift, must " \
 				    "be numeric");
 				return PARSE_FAILURE;
@@ -338,7 +338,7 @@ compatible:
 			a = bstr_next(a);
 
 			mask = bstrtoul(a);
-			if (mask == LONG_MAX) {
+			if (mask == ULONG_MAX) {
 				PARSE_ERR(a, "meta: invalid mask, must be " \
 				    "numeric");
 				return PARSE_FAILURE;