Merge pull request #15 from mattiaswal/use-after-free

BUG: Do not access cfg when cfg is free
westermo · Jun 11, 2018 · 5598aeb · 5598aeb
2 parents 890bdec + eefa59b
commit 5598aeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/dhcp-helper.c b/src/dhcp-helper.c
@@ -313,8 +313,8 @@ static void cleanup(struct ev_loop *loop)
 		}
 	}
 	/* UDP socket not necessary to 'restart' */
-	conf_free(cfg);
 	cleanup_nftables(cfg);
+	conf_free(cfg);
 }
 
 static struct ev_loop *init(struct ev_loop *loop, char *fname)

diff --git a/src/misc.c b/src/misc.c
@@ -167,6 +167,7 @@ int cleanup_nftables(cfg_t *cfg)
 	}
 
 	if (anybridged) {
+		syslog2(LOG_DEBUG, "Some interfaces is bridged, remove nftables rules");
 		if (system("nft  delete chain bridge filter " NFT_IN_CHAIN))
 			syslog2(LOG_ERR, "Failed deleting nftables input rules");
 		if (system("nft  delete chain bridge filter " NFT_FWD_CHAIN))