diff mbox

[libnftnl] chain: fix segfault in 'device' XML parsing

Message ID 20151013073910.19469.65757.stgit@r2d2.cica.es
State Accepted
Delegated to: Pablo Neira
Headers show

Commit Message

Arturo Borrero Oct. 13, 2015, 7:39 a.m. UTC
Reported by valgrind:
[...]
==14065== Process terminating with default action of signal 11 (SIGSEGV)
==14065==  Access not within mapped region at address 0x0
==14065==    at 0x4C2C022: strlen (vg_replace_strmem.c:454)
==14065==    by 0x4E41A93: nftnl_chain_set_str (chain.c:259)
==14065==    by 0x4E427F7: nftnl_mxml_chain_parse (chain.c:770)
==14065==    by 0x4E48F96: nftnl_ruleset_parse_chains (ruleset.c:314)
==14065==    by 0x4E4959A: nftnl_ruleset_xml_parse_ruleset (ruleset.c:625)
==14065==    by 0x4E4959A: nftnl_ruleset_xml_parse_cmd (ruleset.c:668)
==14065==    by 0x4E4959A: nftnl_ruleset_xml_parse (ruleset.c:706)
==14065==    by 0x4E4959A: nftnl_ruleset_do_parse (ruleset.c:734)
==14065==    by 0x4013C9: test_xml (nft-parsing-test.c:166)
==14065==    by 0x4016F4: execute_test (nft-parsing-test.c:214)
==14065==    by 0x400EBA: main (nft-parsing-test.c:330)
[...]

While at it, fix a bit the coding style.

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
 src/chain.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


--
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

Comments

Arturo Borrero Oct. 13, 2015, 9:40 a.m. UTC | #1
On 13 October 2015 at 09:39, Arturo Borrero Gonzalez
<arturo.borrero.glez@gmail.com> wrote:
> Reported by valgrind:
> [...]
> ==14065== Process terminating with default action of signal 11 (SIGSEGV)
> ==14065==  Access not within mapped region at address 0x0
> ==14065==    at 0x4C2C022: strlen (vg_replace_strmem.c:454)
> ==14065==    by 0x4E41A93: nftnl_chain_set_str (chain.c:259)
> ==14065==    by 0x4E427F7: nftnl_mxml_chain_parse (chain.c:770)
> ==14065==    by 0x4E48F96: nftnl_ruleset_parse_chains (ruleset.c:314)
> ==14065==    by 0x4E4959A: nftnl_ruleset_xml_parse_ruleset (ruleset.c:625)
> ==14065==    by 0x4E4959A: nftnl_ruleset_xml_parse_cmd (ruleset.c:668)
> ==14065==    by 0x4E4959A: nftnl_ruleset_xml_parse (ruleset.c:706)
> ==14065==    by 0x4E4959A: nftnl_ruleset_do_parse (ruleset.c:734)
> ==14065==    by 0x4013C9: test_xml (nft-parsing-test.c:166)
> ==14065==    by 0x4016F4: execute_test (nft-parsing-test.c:214)
> ==14065==    by 0x400EBA: main (nft-parsing-test.c:330)
> [...]
>
> While at it, fix a bit the coding style.
>
> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
> ---
>  src/chain.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>

BTW this was reported by the Debian CI system [0].

[0] http://ci.debian.net/packages/libn/libnftnl/unstable/amd64/
Pablo Neira Ayuso Oct. 13, 2015, 10:07 a.m. UTC | #2
On Tue, Oct 13, 2015 at 09:39:10AM +0200, Arturo Borrero Gonzalez wrote:
> Reported by valgrind:
> [...]
> ==14065== Process terminating with default action of signal 11 (SIGSEGV)
> ==14065==  Access not within mapped region at address 0x0
> ==14065==    at 0x4C2C022: strlen (vg_replace_strmem.c:454)
> ==14065==    by 0x4E41A93: nftnl_chain_set_str (chain.c:259)
> ==14065==    by 0x4E427F7: nftnl_mxml_chain_parse (chain.c:770)
> ==14065==    by 0x4E48F96: nftnl_ruleset_parse_chains (ruleset.c:314)
> ==14065==    by 0x4E4959A: nftnl_ruleset_xml_parse_ruleset (ruleset.c:625)
> ==14065==    by 0x4E4959A: nftnl_ruleset_xml_parse_cmd (ruleset.c:668)
> ==14065==    by 0x4E4959A: nftnl_ruleset_xml_parse (ruleset.c:706)
> ==14065==    by 0x4E4959A: nftnl_ruleset_do_parse (ruleset.c:734)
> ==14065==    by 0x4013C9: test_xml (nft-parsing-test.c:166)
> ==14065==    by 0x4016F4: execute_test (nft-parsing-test.c:214)
> ==14065==    by 0x400EBA: main (nft-parsing-test.c:330)
> [...]
> 
> While at it, fix a bit the coding style.

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
diff mbox

Patch

diff --git a/src/chain.c b/src/chain.c
index 8a8e8b8..2b44a31 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -763,10 +763,10 @@  int nftnl_mxml_chain_parse(mxml_node_t *tree, struct nftnl_chain *c,
 			nftnl_chain_set_u32(c, NFTNL_CHAIN_POLICY,
 					       policy);
 		}
-		dev = nftnl_mxml_str_parse(tree, "device", MXML_DESCEND_FIRST,
-					 NFTNL_XML_MAND, err);
 
-		if (table != NULL)
+		dev = nftnl_mxml_str_parse(tree, "device", MXML_DESCEND_FIRST,
+					   NFTNL_XML_MAND, err);
+		if (dev != NULL)
 			nftnl_chain_set_str(c, NFTNL_CHAIN_DEV, dev);
 	}