Patchwork [libnftables] utils: fix error path for nft_strtoi

login
register
mail settings
Submitter Arturo Borrero
Date Aug. 19, 2013, 12:37 p.m.
Message ID <20130819123729.21346.17925.stgit@nfdev.cica.es>
Download mbox | patch
Permalink /patch/268206/
State Accepted
Headers show

Comments

Arturo Borrero - Aug. 19, 2013, 12:37 p.m.
If the return of nft_get_value() is not evaluated, we don't know if the parsed
value is between the limits of his type.

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
 0 files changed


--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira - Aug. 20, 2013, 11:09 a.m.
On Mon, Aug 19, 2013 at 02:37:30PM +0200, Arturo Borrero Gonzalez wrote:
> If the return of nft_get_value() is not evaluated, we don't know if
> the parsed value is between the limits of his type.

Applied, thanks Arturo.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/src/utils.c b/src/utils.c
index 848eba9..9a0bcfe 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -103,6 +103,7 @@  int nft_get_value(enum nft_type type, void *val, void *out)
 
 int nft_strtoi(const char *string, int base, void *out, enum nft_type type)
 {
+	int ret;
 	int64_t sval = 0;
 	uint64_t uval = -1;
 	char *endptr;
@@ -113,14 +114,14 @@  int nft_strtoi(const char *string, int base, void *out, enum nft_type type)
 	case NFT_TYPE_U32:
 	case NFT_TYPE_U64:
 		uval = strtoll(string, &endptr, base);
-		nft_get_value(type, &uval, out);
+		ret = nft_get_value(type, &uval, out);
 		break;
 	case NFT_TYPE_S8:
 	case NFT_TYPE_S16:
 	case NFT_TYPE_S32:
 	case NFT_TYPE_S64:
 		sval = strtoull(string, &endptr, base);
-		nft_get_value(type, &sval, out);
+		ret = nft_get_value(type, &sval, out);
 		break;
 	default:
 		errno = EINVAL;
@@ -132,7 +133,7 @@  int nft_strtoi(const char *string, int base, void *out, enum nft_type type)
 		return -1;
 	}
 
-	return 0;
+	return ret;
 }
 
 const char *nft_verdict2str(uint32_t verdict)