From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56F23C282C3 for ; Thu, 24 Jan 2019 19:27:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 179EF218FE for ; Thu, 24 Jan 2019 19:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548358059; bh=t4GXZGSKgsjam+XzK0DgQOJATIfKkKet/TTtIXgTxYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WNyv/ywvSYDKh91hVgbVXtmJICNPKJJ7bz0+IDrEu0O/niioddTy4fOldxnBNC1B7 h1De6FYaYNq1J85dD5iyA2YDGMTU7/TOEGCsdlTQ+/2SByO4X4Jql4KsNkLiYyIIAz gKCzjoV80SemCyIQjW9XKid+9PxIc3C6/liAJ7/I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729924AbfAXT1i (ORCPT ); Thu, 24 Jan 2019 14:27:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:53828 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730783AbfAXT1d (ORCPT ); Thu, 24 Jan 2019 14:27:33 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6F9F6218A6; Thu, 24 Jan 2019 19:27:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548358052; bh=t4GXZGSKgsjam+XzK0DgQOJATIfKkKet/TTtIXgTxYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=swVbZV7bDrC+W4b5H4cF9AJoxIWzrCrzSWDF8Bh9UQdIkTNx+ZJT6hDpCDXCzIcyH pvvWCjrg48168MI+lNoo4itSgz7Q4qyRw2Q4pOzDsTqCXqxiJNGPtaBGD8oatxIcQh Pjfu0uo+IeZ7iNDBmXRQafNGhqPbdjKkPNfZOcI0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, JianJhen Chen , JinLin Chen , "David S. Miller" Subject: [PATCH 4.4 043/104] net: bridge: fix a bug on using a neighbour cache entry without checking its state Date: Thu, 24 Jan 2019 20:19:32 +0100 Message-Id: <20190124190200.217302179@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190154.968308875@linuxfoundation.org> References: <20190124190154.968308875@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: JianJhen Chen [ Upstream commit 4c84edc11b76590859b1e45dd676074c59602dc4 ] When handling DNAT'ed packets on a bridge device, the neighbour cache entry from lookup was used without checking its state. It means that a cache entry in the NUD_STALE state will be used directly instead of entering the NUD_DELAY state to confirm the reachability of the neighbor. This problem becomes worse after commit 2724680bceee ("neigh: Keep neighbour cache entries if number of them is small enough."), since all neighbour cache entries in the NUD_STALE state will be kept in the neighbour table as long as the number of cache entries does not exceed the value specified in gc_thresh1. This commit validates the state of a neighbour cache entry before using the entry. Signed-off-by: JianJhen Chen Reviewed-by: JinLin Chen Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/bridge/br_netfilter_hooks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c @@ -267,7 +267,7 @@ int br_nf_pre_routing_finish_bridge(stru struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb); int ret; - if (neigh->hh.hh_len) { + if ((neigh->nud_state & NUD_CONNECTED) && neigh->hh.hh_len) { neigh_hh_bridge(&neigh->hh, skb); skb->dev = nf_bridge->physindev; ret = br_handle_frame_finish(net, sk, skb);