diff options
| author | Leon Yu <chianglungyu@gmail.com> | 2014-06-01 05:37:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-02 17:49:45 -0700 |
| commit | 418c96ac151a16a5094a95d14252c92c1d47ec67 (patch) | |
| tree | cbe75d2edab13883541e85522ecdec063785b22d /net | |
| parent | 3aab01d800eb195de3f273d9a195fe070a507d56 (diff) | |
| download | linux-stable-418c96ac151a16a5094a95d14252c92c1d47ec67.tar.gz linux-stable-418c96ac151a16a5094a95d14252c92c1d47ec67.tar.bz2 linux-stable-418c96ac151a16a5094a95d14252c92c1d47ec67.zip | |
net: filter: fix possible memory leak in __sk_prepare_filter()
__sk_prepare_filter() was reworked in commit bd4cf0ed3 (net: filter:
rework/optimize internal BPF interpreter's instruction set) so that it should
have uncharged memory once things went wrong. However that work isn't complete.
Error is handled only in __sk_migrate_filter() while memory can still leak in
the error path right after sk_chk_filter().
Fixes: bd4cf0ed331a ("net: filter: rework/optimize internal BPF interpreter's instruction set")
Signed-off-by: Leon Yu <chianglungyu@gmail.com>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Tested-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/filter.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index 9d79ca0a6e8e..4aec7b93f1a9 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -1559,8 +1559,13 @@ static struct sk_filter *__sk_prepare_filter(struct sk_filter *fp, fp->jited = 0; err = sk_chk_filter(fp->insns, fp->len); - if (err) + if (err) { + if (sk != NULL) + sk_filter_uncharge(sk, fp); + else + kfree(fp); return ERR_PTR(err); + } /* Probe if we can JIT compile the filter and if so, do * the compilation of the filter. |