bpf_dbg: always close socket in bpf_runnable
authorDaniel Borkmann <dborkman@redhat.com>
Mon, 16 Dec 2013 10:45:00 +0000 (11:45 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Dec 2013 22:11:00 +0000 (17:11 -0500)
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.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
tools/net/bpf_dbg.c

index 0fdcb707a2e7b241a66559f125439682f449f588..65dc757f7f7b5c8d41bf49d95fe47df6b549c4fc 100644 (file)
@@ -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) {