From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrey Vagin Subject: [PATCH] net: don't forget to free sk_filter Date: Wed, 6 Nov 2013 19:51:46 +0400 Message-ID: <1383753106-26978-1-git-send-email-avagin@openvz.org> Cc: linux-kernel@vger.kernel.org, Andrey Vagin , Alexei Starovoitov , Eric Dumazet , "David S. Miller" , stable@vger.kernel.org.#.3.12 To: netdev@vger.kernel.org Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org sk_filter isn't freed if bpf_func is equal to sk_run_filter. This memory leak was introduced by commit d45ed4a4e33ae103053c0a53d280014e7101bb5c Author: Alexei Starovoitov Date: Fri Oct 4 00:14:06 2013 -0700 net: fix unsafe set_memory_rw from softirq Before this patch sk_filter was freed in sk_filter_release_rcu, now it is freed in bpf_jit_free. Here is output of kmemleak: unreferenced object 0xffff8800b774eab0 (size 128): comm "systemd", pid 1, jiffies 4294669014 (age 124.062s) hex dump (first 32 bytes): 00 00 00 00 0b 00 00 00 20 63 7f b7 00 88 ff ff ........ c...... 60 d4 55 81 ff ff ff ff 30 d9 55 81 ff ff ff ff `.U.....0.U..... backtrace: [] kmemleak_alloc+0x4e/0xb0 [] __kmalloc+0xef/0x260 [] sock_kmalloc+0x38/0x60 [] sk_attach_filter+0x5d/0x190 [] sock_setsockopt+0x991/0x9e0 [] SyS_setsockopt+0xb6/0xd0 [] system_call_fastpath+0x16/0x1b [] 0xffffffffffffffff Cc: Alexei Starovoitov Cc: Eric Dumazet Cc: "David S. Miller" Cc: stable@vger.kernel.org # 3.12 Signed-off-by: Andrey Vagin --- arch/x86/net/bpf_jit_comp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 516593e..3c55de5 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -788,5 +788,6 @@ void bpf_jit_free(struct sk_filter *fp) if (fp->bpf_func != sk_run_filter) { INIT_WORK(&fp->work, bpf_jit_free_deferred); schedule_work(&fp->work); - } + } else + kfree(fp); } -- 1.8.3.1