From: Hans Schillstrom Date: Mon, 5 Mar 2012 02:24:29 +0000 (+0000) Subject: netfilter: ctnetlink: fix lockep splats X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b988ece9b42452c59da5844942661cd782b2473;p=linux-beck.git netfilter: ctnetlink: fix lockep splats net/netfilter/nf_conntrack_proto.c:70 suspicious rcu_dereference_check() usage! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 3 locks held by conntrack/3235: nfnl_lock+0x17/0x20 netlink_dump+0x32/0x240 ctnetlink_dump_table+0x3e/0x170 [nf_conntrack_netlink] stack backtrace: Pid: 3235, comm: conntrack Tainted: G W 3.2.0+ #511 Call Trace: [] lockdep_rcu_suspicious+0xe5/0x100 [] __nf_ct_l4proto_find+0x81/0xb0 [nf_conntrack] [] ctnetlink_fill_info+0x215/0x5f0 [nf_conntrack_netlink] [] ctnetlink_dump_table+0xd1/0x170 [nf_conntrack_netlink] [] netlink_dump+0x7f/0x240 [] ? trace_hardirqs_on+0xd/0x10 [] netlink_dump_start+0xdf/0x190 [] ? ctnetlink_change_nat_seq_adj+0x160/0x160 [nf_conntrack_netlink] [] ? ctnetlink_get_conntrack+0x2a0/0x2a0 [nf_conntrack_netlink] [] ctnetlink_get_conntrack+0x89/0x2a0 [nf_conntrack_netlink] [] nfnetlink_rcv_msg+0x467/0x5f0 [] ? nfnetlink_rcv_msg+0x49c/0x5f0 [] ? nfnetlink_rcv_msg+0x342/0x5f0 [] ? get_parent_ip+0x11/0x50 [] ? nfnetlink_subsys_register+0x60/0x60 [] netlink_rcv_skb+0xa9/0xd0 [] nfnetlink_rcv+0x15/0x20 [] netlink_unicast+0x1ae/0x1f0 [] netlink_sendmsg+0x2c6/0x320 [] sock_sendmsg+0x117/0x130 [] ? might_fault+0x53/0xb0 [] ? might_fault+0x9c/0xb0 [] ? might_fault+0x53/0xb0 [] ? move_addr_to_kernel+0x71/0x80 [] sys_sendto+0xfe/0x130 [] ? sys_bind+0xb4/0xd0 [] ? retint_swapgs+0xe/0x13 [] system_call_fastpath+0x16/0x1b Reported-by: Hans Schillstrom Signed-off-by: Eric Dumazet Signed-off-by: Hans Schillstrom --- diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index b8827e8a11fe..c1ea64c6c70d 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -110,15 +110,16 @@ ctnetlink_dump_tuples(struct sk_buff *skb, struct nf_conntrack_l3proto *l3proto; struct nf_conntrack_l4proto *l4proto; + rcu_read_lock(); l3proto = __nf_ct_l3proto_find(tuple->src.l3num); ret = ctnetlink_dump_tuples_ip(skb, tuple, l3proto); - if (unlikely(ret < 0)) - return ret; - - l4proto = __nf_ct_l4proto_find(tuple->src.l3num, tuple->dst.protonum); - ret = ctnetlink_dump_tuples_proto(skb, tuple, l4proto); - + if (ret >= 0) { + l4proto = __nf_ct_l4proto_find(tuple->src.l3num, + tuple->dst.protonum); + ret = ctnetlink_dump_tuples_proto(skb, tuple, l4proto); + } + rcu_read_unlock(); return ret; } @@ -712,9 +713,11 @@ ctnetlink_dump_table(struct sk_buff *skb, struct netlink_callback *cb) struct hlist_nulls_node *n; struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh); u_int8_t l3proto = nfmsg->nfgen_family; + int res; #ifdef CONFIG_NF_CONNTRACK_MARK const struct ctnetlink_dump_filter *filter = cb->data; #endif + spin_lock_bh(&nf_conntrack_lock); last = (struct nf_conn *)cb->args[1]; for (; cb->args[0] < net->ct.htable_size; cb->args[0]++) { @@ -740,11 +743,14 @@ restart: continue; } #endif - if (ctnetlink_fill_info(skb, NETLINK_CB(cb->skb).pid, - cb->nlh->nlmsg_seq, - NFNL_MSG_TYPE( - cb->nlh->nlmsg_type), - ct) < 0) { + rcu_read_lock(); + res = + ctnetlink_fill_info(skb, NETLINK_CB(cb->skb).pid, + cb->nlh->nlmsg_seq, + NFNL_MSG_TYPE(cb->nlh->nlmsg_type), + ct); + rcu_read_unlock(); + if (res < 0) { nf_conntrack_get(&ct->ct_general); cb->args[1] = (unsigned long)ct; goto out; @@ -1649,14 +1655,16 @@ ctnetlink_exp_dump_mask(struct sk_buff *skb, if (!nest_parms) goto nla_put_failure; + rcu_read_lock(); l3proto = __nf_ct_l3proto_find(tuple->src.l3num); ret = ctnetlink_dump_tuples_ip(skb, &m, l3proto); - - if (unlikely(ret < 0)) - goto nla_put_failure; - - l4proto = __nf_ct_l4proto_find(tuple->src.l3num, tuple->dst.protonum); + if (ret >= 0) { + l4proto = __nf_ct_l4proto_find(tuple->src.l3num, + tuple->dst.protonum); ret = ctnetlink_dump_tuples_proto(skb, &m, l4proto); + } + rcu_read_unlock(); + if (unlikely(ret < 0)) goto nla_put_failure;