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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 5B2F4C04E53 for ; Wed, 15 May 2019 11:23:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20F9420818 for ; Wed, 15 May 2019 11:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919385; bh=kLcfzGn5Vwa9npdD43qp06qIaJlAgpbDeFYCshauVk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=e71+dSnQXgnghXN3WylVBXyXqr0l5G+BVxXvwmCN2sX480ui06WepaafNvKTjN5UW 1qZDh+oDRfIfg0NunZPvzH2+kP2ZEsvwo+EDw0JlMrM6X9M+KyKfKhurv7cDLGI1Un VAwsox3wBYMuIcNHcqQG3yN2FKvJuYV0uklDUvKU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731565AbfEOLXE (ORCPT ); Wed, 15 May 2019 07:23:04 -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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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