Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp477226yba; Wed, 15 May 2019 04:50:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqwcSYZG8SKbmtsJpcUQ+AF96OEEV/hNgIlR2SJK8Ws0o0u19JJn7OH7w/CMi+Hhlr4nNtIt X-Received: by 2002:a62:f245:: with SMTP id y5mr46751466pfl.12.1557921042365; Wed, 15 May 2019 04:50:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557921042; cv=none; d=google.com; s=arc-20160816; b=JEOQ8v+SO7m4q6iWcq7lAHuwgpbnSBif1qF4E0JI3fjD9HbBJJ4MZcNcvrLtwtjEI5 WQLlJCW2FGG55qBuOEFobvWuPADNvGiXEisofaeFndwd2KoqnmzjmaDWn7Qj2vv+Obfy 0Gd9l+NKXVEKTN2JSgSfQKy2AQVEe3rYHvDS5nVyTiTjhGTKChKKb5TqsSf/bY3NkjW2 wqKtwS0lDv4tQyGIvV0jI46RkFVn+s9yzT4dDyGqy1mNGiYHuursLbK0xl4NhGiR1gMI +GeeYxLLkDQ27eLzJMdhv18Wy7je62HY15vEDUzhIC/jTSIVrcmN+pmjMO9FvDdxaXd3 6KvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/Rp5TsJ9PsoTsqbYUdFnJYmi8Gxyc9dtKBda6KkkZCQ=; b=Y3I+cg0og2iS/wXblBitZbHK+rgy1V0WujDO8P75T03fh1jHrZpeWKWHKfOYRxWLnr e5Mla2iaywyda27iVhJCf9Sxc56wjxpLkfgA5KtL/cZBwXGKyp9L6+Hy+glGl1zXY/8X uLFq5czCFwXdxdMoMA82JCfcYQvkLxcgFy5BEQFPoxa9FK7dLYLIxOa++mKcww6Idswa sFYxgQ4rZ36TSEX3cBbIWPFR92UHYEnktUeRHy7SPHk7YFi0Xc8rQQztQJ9utw/Ccf/f d3uffXyfU2yL0OKBNHHNOV3u55v3iYGYa3Juez84vq6ZwX/IIi4gtO1uUbZu26QkuMA8 FG+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0mUReaog; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j30si1645578pgl.338.2019.05.15.04.50.27; Wed, 15 May 2019 04:50:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0mUReaog; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731585AbfEOLXK (ORCPT + 99 others); Wed, 15 May 2019 07:23:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:33338 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731563AbfEOLXD (ORCPT ); Wed, 15 May 2019 07:23:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 89C48206BF; Wed, 15 May 2019 11:23:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919383; bh=kLcfzGn5Vwa9npdD43qp06qIaJlAgpbDeFYCshauVk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0mUReaogfTzMdfkL9ny8XTnyH2RcQOFPZhYkt4C8Nrqcby2kM4nKfOruxXFiQUrV+ wdsLeX9Z540km4SDSZvlFyodbkwApQrD/LaWcylbJSPKL3Xkt+sjAtATHjCn43c1mL 2Ue2hxebrEHNX9C6isiKGaxZTD9Tt7t3MgfNLeWg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Westphal , Andrei Vagin , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 4.19 055/113] netfilter: fix nf_l4proto_log_invalid to log invalid packets Date: Wed, 15 May 2019 12:55:46 +0200 Message-Id: <20190515090657.797760292@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090652.640988966@linuxfoundation.org> References: <20190515090652.640988966@linuxfoundation.org> User-Agent: quilt/0.66 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 [ Upstream commit d48668052b2603b6262459625c86108c493588dd ] It doesn't log a packet if sysctl_log_invalid isn't equal to protonum OR sysctl_log_invalid isn't equal to IPPROTO_RAW. This sentence is always true. I believe we need to replace OR to AND. Cc: Florian Westphal Fixes: c4f3db1595827 ("netfilter: conntrack: add and use nf_l4proto_log_invalid") Signed-off-by: Andrei Vagin Acked-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_proto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c index 51c5d7eec0a35..e903ef9b96cf3 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c @@ -86,7 +86,7 @@ void nf_l4proto_log_invalid(const struct sk_buff *skb, struct va_format vaf; va_list args; - if (net->ct.sysctl_log_invalid != protonum || + if (net->ct.sysctl_log_invalid != protonum && net->ct.sysctl_log_invalid != IPPROTO_RAW) return; -- 2.20.1