two bpf tools fixes
Subsystems (2)
cover two bpf tools fixes
Found two follow-up things that need to be fixed. Thanks!
Daniel Borkmann (2):
bpf_dbg: always close socket in bpf_runnable
bpf_exp: free duplicated labels at exit time
tools/net/bpf_dbg.c | 2 +- tools/net/bpf_exp.y | 27 ++++++++++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/2 bpf_dbg: always close socket in bpf_runnable
We must not leave the socket intact in bpf_runnable(). The socket is used to test if the filter code is being accepted by the kernel or not. So right after we do the setsockopt(2), we need to close it again.
--- tools/net/bpf_dbg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/net/bpf_dbg.c +1 -1
@@ -512,11 +512,11 @@ static bool bpf_runnable(struct sock_filter *f, unsigned int len)return false; } ret =setsockopt (sock,SOL_SOCKET ,SO_ATTACH_FILTER , &bpf,sizeof (bpf)); +close (sock);if (ret <0 ) {rl_printf ("program not allowed to run by kernel!\n" );return false; } -close (sock);for (i =0 ; i < len; i++) {if (BPF_CLASS (f[i].code) ==BPF_LD && f[i].k >SKF_AD_OFF ) {
Signature · 1 line
1.8.3.1
PATCH 2/2 bpf_exp: free duplicated labels at exit time
In reply to Daniel BorkmannValgrind found that extracted labels that are passed from the lexer weren't freed upon exit. Therefore, add a small helper function that walks label tables and frees them. Since also NULL can be passed to free(3), we do not need to take care of that here. While at it, fix up a spacing error in bpf_set_curr_label().
--- tools/net/bpf_exp.y | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
tools/net/bpf_exp.y +20 -7
@@ -40,8 +40,8 @@ extern void yyerror(const char *str); extern void bpf_asm_compile(FILE *fp, bool cstyle); static void bpf_set_curr_instr(uint16_t op, uint8_t jt, uint8_t jf, uint32_t k); -static void bpf_set_curr_label(const char *label); -static void bpf_set_jmp_label(const char *label, enum jmp_type type); +static void bpf_set_curr_label(char *label); +static void bpf_set_jmp_label(char *label, enum jmp_type type); %}
@@ -573,7 +573,7 @@ txa static int curr_instr = 0; static struct sock_filter out[BPF_MAXINSNS]; -static const char **labels, **labels_jt, **labels_jf, **labels_k; +static char **labels, **labels_jt, **labels_jf, **labels_k; static void bpf_assert_max(void) {
@@ -594,13 +594,13 @@ static void bpf_set_curr_instr(uint16_t code, uint8_t jt, uint8_t jf, curr_instr++; } -static void bpf_set_curr_label(const char *label) +static void bpf_set_curr_label(char *label) { bpf_assert_max(); - labels[curr_instr] = label; + labels[curr_instr] = label; } -static void bpf_set_jmp_label(const char *label, enum jmp_type type) +static void bpf_set_jmp_label(char *label, enum jmp_type type) { bpf_assert_max(); switch (type) {
@@ -717,12 +717,25 @@ static void bpf_init(void) assert(labels_k); } +static void bpf_destroy_labels(void) +{ + int i; + + for (i = 0; i < curr_instr; i++) { + free(labels_jf[i]); + free(labels_jt[i]); + free(labels_k[i]); + free(labels[i]); + } +} + static void bpf_destroy(void) { - free(labels); + bpf_destroy_labels(); free(labels_jt); free(labels_jf); free(labels_k); + free(labels); } void bpf_asm_compile(FILE *fp, bool cstyle)
Signature · 1 line
1.8.3.1
David Miller
maintainerFrom: Daniel Borkmann <[email protected]>
Date: Mon, 16 Dec 2013 11:44:59 +0100
Quoted 1 line
Found two follow-up things that need to be fixed. Thanks!
Both applied, thanks Daniel.