From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x22528yKXBoInZUUTfFOZC9r3vVrhYPPyZqYjqbLJcV2qUyArd7vHKxTK8rWCaISaxMb5/mEB ARC-Seal: i=1; a=rsa-sha256; t=1517256313; cv=none; d=google.com; s=arc-20160816; b=wockOmzDfKojExd6QNkuaOiQnnJF4OrB9DO6tMMKE1RatsBojnoQA99F+SuyqwoBxk f1QLYo0269uUloG9/j6BPwNF8uPAKo2006HvBgNsYoEaDuS5hDsr8CNWYg5Qy9zkOEmq zGLSqPt3qRd4+daU2YakYLfG3gqzOgHDqK0+f16+oXWa9+bg49lwX++UeYJoyuSlpkAz ZMmH+ZQZePz5/+JDImFsxB5Er2QvZIyN73xcMntZ4O8y2qY2EJyGGYR+cRPQdQIPAYSS tD5eaxhL0Lde/tRfyMw7Vv87vi/8LBYNV+PZ1uIRdID/d4P5Qf1o+1jjIXVG9kmlRj7s sUcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=otCFLgMLDLNbwqIfI/EFrC0aBoPRk9y18gk7pOiall4=; b=JBhSiDYPb+3/57u7nXsLUXJipWBv/qsMp44HQ6r64bz4o4DjOYlhAb1gKekvcTmhfS j78QqiiPIXhFjk2yPAdQ/3isoqWs+T01zZ/XwMT55PYL+KyjPZ6gE7TTtDnMm4Bck0XA 9ywSq2Tg38LeREWC5aBKrRphLc21ql6XQjHzBFdSo8CA99fRrEavsjjjqoQ5Natb5qVK UmzP+Yd8iUv4DGNefjtf9oDpoN6YEkxQY/pu7mtH3Mju+jt5sNY3xK3W8yTPr2AJlLhf jUdC9AcNx7vd+YsIePglznihKhsVRUo5hZGC/j7kcHizElSw8IpV8NtofGi2v3OOROfR Oj+A== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Florian Westphal , Pablo Neira Ayuso , Michal Kubecek Subject: [PATCH 3.18 28/52] netfilter: restart search if moved to other chain Date: Mon, 29 Jan 2018 13:56:46 +0100 Message-Id: <20180129123629.430826236@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123628.168904217@linuxfoundation.org> References: <20180129123628.168904217@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958556636502524?= X-GMAIL-MSGID: =?utf-8?q?1590958556636502524?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Westphal commit 95a8d19f28e6b29377a880c6264391a62e07fccc upstream. In case nf_conntrack_tuple_taken did not find a conflicting entry check that all entries in this hash slot were tested and restart in case an entry was moved to another chain. Reported-by: Eric Dumazet Fixes: ea781f197d6a ("netfilter: nf_conntrack: use SLAB_DESTROY_BY_RCU and get rid of call_rcu()") Signed-off-by: Florian Westphal Acked-by: Eric Dumazet Signed-off-by: Pablo Neira Ayuso Acked-by: Michal Kubecek Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nf_conntrack_core.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -695,6 +695,7 @@ nf_conntrack_tuple_taken(const struct nf * least once for the stats anyway. */ rcu_read_lock_bh(); + begin: hlist_nulls_for_each_entry_rcu(h, n, &net->ct.hash[hash], hnnode) { ct = nf_ct_tuplehash_to_ctrack(h); if (ct != ignored_conntrack && @@ -706,6 +707,12 @@ nf_conntrack_tuple_taken(const struct nf } NF_CT_STAT_INC(net, searched); } + + if (get_nulls_value(n) != hash) { + NF_CT_STAT_INC(net, search_restart); + goto begin; + } + rcu_read_unlock_bh(); return 0;