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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 31FE8C432C0 for ; Mon, 2 Dec 2019 18:54:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 001C22070A for ; Mon, 2 Dec 2019 18:54:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=tanaza-com.20150623.gappssmtp.com header.i=@tanaza-com.20150623.gappssmtp.com header.b="DQJ1grk3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728010AbfLBSyu (ORCPT ); Mon, 2 Dec 2019 13:54:50 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:34002 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727938AbfLBSyt (ORCPT ); Mon, 2 Dec 2019 13:54:49 -0500 Received: by mail-wr1-f65.google.com with SMTP id t2so532772wrr.1 for ; Mon, 02 Dec 2019 10:54:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tanaza-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bPd+QRgs7ePapql6POhB+1aBTSVvo7+m0B0hFM2W+V8=; b=DQJ1grk3fubDUDRNIt4KhApuKumbTnZSajmxJ9nBjaFEFM6B58uU2dOog+9u5eBG6n E8+NBcrHwayofy0fSgbIfVGUfA4mm+SFogkgbrPJDLSVgAFPddW3P8NgvbWrK6x6WF1E Xuhf2NPJoZ2pQcJfT1VTkKtp3fJLjfyLg/TiPPyJpTs8VD7Yrnwxz3ivGxqmLswZ3+/9 WrBTDjAs+Z+c9A5wLAZmg0hvWkZpHKtCLidQnATwSA42ELCzQxp1HLUvvcuJNxTSb/En qi7LcMjeBtQhBqXFbONdafq6gpFVVzzwDYgkx6fxIV+idaNOfq7FzoGwVwZVPggK/tit OA8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bPd+QRgs7ePapql6POhB+1aBTSVvo7+m0B0hFM2W+V8=; b=KMrorVj5PIYb4q6vLc/NNaBz+yWxVCCV3jmKOHJLif735CK444Be4q85rEgEQobipF v3pxrScDkpTTS8uutY+D1qkgR7nsyWF3zd8JWe01igh3Wr/tJm45vLXFTm9sfMbxR4zR 7VgHx1k3T1KXq27UbZ6wjA+YPaxuUTEvveUGP4wA4ljZCOXK693eQ2ijm6FwKvORmNDn Ag0ngsFA5PCCSghT9RKUs1SAUFGBOQlrPLDW8octFQJOLf9GwQqqq0k4r9RldXLZbtBJ s+bjviCDajfM5MY8F7GtE6M6fzJPtQQ+V9Z4mbyzbLAKJ0kLRwz/kHxaBV0pGCIVMz9/ SGWg== X-Gm-Message-State: APjAAAXUnXNyUEWBDY9yhmtmZq0zFlAKot7ksP6722+EtY7nMMbYx4a4 nvmkxjAKQBkRDgwUjzuoJoBHjy+CqOHmcQ== X-Google-Smtp-Source: APXvYqx1ZGRENX56qCtXtMhoJ7rYkDTJZ6IjBtbYyorxB3w5aIoh6cn+ggq5mollvDJybTecVRH4jg== X-Received: by 2002:adf:d848:: with SMTP id k8mr458638wrl.328.1575312887566; Mon, 02 Dec 2019 10:54:47 -0800 (PST) Received: from localhost.localdomain ([37.162.99.119]) by smtp.gmail.com with ESMTPSA id c72sm376580wmd.11.2019.12.02.10.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 10:54:47 -0800 (PST) From: Marco Oliverio To: netfilter-devel@vger.kernel.org Cc: netdev@vger.kernel.org, fw@strlen.de, rocco.folino@tanaza.com, Marco Oliverio Subject: [PATCH nf] netfilter: nf_queue: enqueue skbs with NULL dst Date: Mon, 2 Dec 2019 19:54:30 +0100 Message-Id: <20191202185430.31367-1-marco.oliverio@tanaza.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Bridge packets that are forwarded have skb->dst == NULL and get dropped by the check introduced by b60a77386b1d4868f72f6353d35dabe5fbe981f2 (net: make skb_dst_force return true when dst is refcounted). To fix this we check skb_dst() before skb_dst_force(), so we don't drop skb packet with dst == NULL. This holds also for skb at the PRE_ROUTING hook so we remove the second check. Fixes: b60a773 ("net: make skb_dst_forcereturn true when dst is refcounted") Signed-off-by: Marco Oliverio Signed-off-by: Rocco Folino --- net/netfilter/nf_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index a2b58de82600..f8f52ff99cfb 100644 --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c @@ -189,7 +189,7 @@ static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state, goto err; } - if (!skb_dst_force(skb) && state->hook != NF_INET_PRE_ROUTING) { + if (skb_dst(skb) && !skb_dst_force(skb)) { status = -ENETDOWN; goto err; } -- 2.24.0