Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 418c96ac151a16a5094a95d14252c92c1d47ec67

Authored by Leon Yu
Committed by David S. Miller
1 parent 3aab01d800
Exists in ti-lsk-linux-4.1.y and in 12 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y

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>

Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff

... ... @@ -1559,8 +1559,13 @@
1559 1559 fp->jited = 0;
1560 1560  
1561 1561 err = sk_chk_filter(fp->insns, fp->len);
1562   - if (err)
  1562 + if (err) {
  1563 + if (sk != NULL)
  1564 + sk_filter_uncharge(sk, fp);
  1565 + else
  1566 + kfree(fp);
1563 1567 return ERR_PTR(err);
  1568 + }
1564 1569  
1565 1570 /* Probe if we can JIT compile the filter and if so, do
1566 1571 * the compilation of the filter.