src: file descriptor leak in include_file()
Pablo Neira Ayuso
maintainerPATCH v2 1/1 src: file descriptor leak in include_file()
File that contains the ruleset is never closed, track open files through the nft_ctx object and close them accordingly.
Reported-by Václav Zindulka <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: skip a few redundant scanner parameters in functions
include/nftables.h | 3 +++ include/parser.h | 6 +++--- src/libnftables.c | 6 +++--- src/scanner.l | 42 +++++++++++++++++++++++------------------- 4 files changed, 32 insertions(+), 25 deletions(-)
include/nftables.h +3 -0
@@ -86,6 +86,8 @@ struct nft_cache {struct mnl_socket ;struct parser_state ; +#define MAX_INCLUDE_DEPTH 16 +struct nft_ctx {struct mnl_socket *nf_sock;char **include_paths;
@@ -99,6 +101,7 @@ struct nft_ctx {struct parser_state *state;void *scanner;void *json_root; +FILE *f[MAX_INCLUDE_DEPTH ]; };enum nftables_exit_codes {
include/parser.h +3 -3
@@ -3,8 +3,8 @@#include <list.h> #include <rule.h> // FIXME +#include <nftables.h> -#define MAX_INCLUDE_DEPTH 16#define TABSIZE 8#define YYLTYPE struct location
@@ -36,9 +36,9 @@ extern void parser_init(struct nft_ctx *nft, struct parser_state *state,extern int nft_parse (struct nft_ctx *ctx,void *,struct parser_state *state);extern void *scanner_init (struct parser_state *state); -extern void scanner_destroy (void *scanner); +extern void scanner_destroy (struct nft_ctx *nft); -extern int scanner_read_file (void *scanner,const char *filename, +extern int scanner_read_file (struct nft_ctx *nft,const char *filename,const struct location *loc); extern int scanner_include_file(struct nft_ctx *ctx, void *scanner, const char *filename,
src/libnftables.c +3 -3
@@ -364,7 +364,7 @@ static int nft_parse_bison_filename(struct nft_ctx *nft, const char *filename,parser_init (nft, nft->state, msgs, cmds); nft->scanner =scanner_init (nft->state); -if (scanner_read_file (nft->scanner, filename, &internal_location) <0 ) +if (scanner_read_file (nft, filename, &internal_location) <0 )return -1 ; ret =nft_parse (nft, nft->scanner, nft->state);
@@ -405,7 +405,7 @@ err: }iface_cache_release ();if (nft->scanner) { -scanner_destroy (nft->scanner); +scanner_destroy (nft); nft->scanner =NULL ; }free (nlbuf);
@@ -449,7 +449,7 @@ err: }iface_cache_release ();if (nft->scanner) { -scanner_destroy (nft->scanner); +scanner_destroy (nft); nft->scanner =NULL ; }
src/scanner.l +23 -19
113 lines not on this page · raw message
Signature · 1 line
2.11.0