diff mbox

netfilter: nf_tables: fix oops when deleting a chain with references

Message ID 20140125080407.GA15949@macbook.localnet
State Accepted
Headers show

Commit Message

Patrick McHardy Jan. 25, 2014, 8:04 a.m. UTC
commit 780f57420cdac84eabec388868678ede19f7d682
Author: Patrick McHardy <kaber@trash.net>
Date:   Fri Jan 24 13:23:52 2014 +0000

    netfilter: nf_tables: fix oops when deleting a chain with references

    THe following commands trigger an oops:

    # nft -i
    nft> add table filter
    nft> add chain filter input { type filter hook input priority 0; }
    nft> add chain filter test 
    nft> add rule filter input jump test
    nft> delete chain filter test
    
    We need to check the chain use counter before allowing destruction since
    we might have references from sets or jump rules.
    
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=69341
    Reported-by: Matthew Ife <deleriux1@gmail.com>
    Tested-by: Matthew Ife <deleriux1@gmail.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Pablo Neira Ayuso Jan. 29, 2014, 7:22 p.m. UTC | #1
On Sat, Jan 25, 2014 at 08:04:07AM +0000, Patrick McHardy wrote:
> commit 780f57420cdac84eabec388868678ede19f7d682
> Author: Patrick McHardy <kaber@trash.net>
> Date:   Fri Jan 24 13:23:52 2014 +0000
> 
>     netfilter: nf_tables: fix oops when deleting a chain with references
> 
>     THe following commands trigger an oops:
> 
>     # nft -i
>     nft> add table filter
>     nft> add chain filter input { type filter hook input priority 0; }
>     nft> add chain filter test 
>     nft> add rule filter input jump test
>     nft> delete chain filter test
>     
>     We need to check the chain use counter before allowing destruction since
>     we might have references from sets or jump rules.

Applied, thanks Patrick.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 117bbaa..9ce3053 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -1045,7 +1045,7 @@  static int nf_tables_delchain(struct sock *nlsk, struct sk_buff *skb,
 	if (IS_ERR(chain))
 		return PTR_ERR(chain);
 
-	if (!list_empty(&chain->rules))
+	if (!list_empty(&chain->rules) || chain->use > 0)
 		return -EBUSY;
 
 	list_del(&chain->list);