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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 965CEC433F5 for ; Sat, 5 Mar 2022 18:09:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231574AbiCESJ7 (ORCPT ); Sat, 5 Mar 2022 13:09:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231737AbiCESJ6 (ORCPT ); Sat, 5 Mar 2022 13:09:58 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5EE423DDF3 for ; Sat, 5 Mar 2022 10:09:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646503747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Gi/sdentGCwJJGJ5wrqkGxtQ+g48o6zHIXuxsk4d4Og=; b=Ej+74qS6Blxr1HPxx7es8uxjv+lpCZ6aUZHW5Ek+uXxhicG3SFr7XL+JvSLaveqkqvPj+I af+lGr16CUJ8tGTjRhxmBSW+S7FnkO+JrVBf01mpEXE6rkAjzLhgZY6dPycMa1skfaERsv 8ELzG6ljFs2ik5/bNDKYiahWedzccGI= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-647-7qbBZYdSNAakaeYXplSTTg-1; Sat, 05 Mar 2022 13:09:06 -0500 X-MC-Unique: 7qbBZYdSNAakaeYXplSTTg-1 Received: by mail-qv1-f72.google.com with SMTP id fq2-20020a056214258200b0042c39c09e5dso9622626qvb.18 for ; Sat, 05 Mar 2022 10:09:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Gi/sdentGCwJJGJ5wrqkGxtQ+g48o6zHIXuxsk4d4Og=; b=ICHzLqPysMMHynZByvk1pOqC21HNIt+YR5Ph0R182lh1DvHZOY0anycUWFq4TAarcO BebaGYZ8frewf2MajXzn6mgBz/Ks3032ToslprZjHp2yYW7OHZknyE5xA6oGV43ZDTsP KF/XKqJYCIe0ZON03tyiCiM3Yqc81mdHSZEvb4N3wZFl0VQOj64xMjofUCrtbMGZHGDu rGEzF3XXgyjSBleV7pJKN91dycA4ZTA4OXODki+Cj1nIPhLDNF6HHa4hlrN2E/cKGcGt lgpoqyTriIInaNcRnYAFaVXNvfW/ljVw9agFr8XaFVkzBEu4FK63SrKmS0YjyqtIgSKq eIwg== X-Gm-Message-State: AOAM532NKQww2rwFUBCXRHk7fRvs9QX10+nhhQJje9VCfNH+5UyVZHN4 W+Sf78qYimdluvJMboixbb5FytPZ6I3mHQfyIwF4fE4CW0wA5C59NQ3PDcFRjsoQdAYzzvAaRu8 3d41+Lv2FdWL7FVMt/UeSrs1sBGmM X-Received: by 2002:a05:620a:1720:b0:634:1cd4:5e5b with SMTP id az32-20020a05620a172000b006341cd45e5bmr2608688qkb.558.1646503745729; Sat, 05 Mar 2022 10:09:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJxGQ5mlxFSBTdBgddKAUdV2p2Ns+ucnV6BHi6nFkEtU3qBjVYOOUXVkuI6oaIaGKt74fm3AZQ== X-Received: by 2002:a05:620a:1720:b0:634:1cd4:5e5b with SMTP id az32-20020a05620a172000b006341cd45e5bmr2608676qkb.558.1646503745526; Sat, 05 Mar 2022 10:09:05 -0800 (PST) Received: from localhost.localdomain.com (024-205-208-113.res.spectrum.com. [24.205.208.113]) by smtp.gmail.com with ESMTPSA id x6-20020ac86b46000000b002e02be9c0easm5175904qts.69.2022.03.05.10.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 10:09:05 -0800 (PST) From: trix@redhat.com To: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de, davem@davemloft.net, kuba@kernel.org Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Rix Subject: [PATCH] netfilter: conditionally use ct and ctinfo Date: Sat, 5 Mar 2022 10:08:53 -0800 Message-Id: <20220305180853.696640-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Tom Rix The setting ct and ctinfo are controlled by CONF_NF_CONNTRACK. So their use should also be controlled. Signed-off-by: Tom Rix --- net/netfilter/nfnetlink_log.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index d97eb280cb2e8..141e0ebf4bc23 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -629,9 +629,11 @@ __build_packet_message(struct nfnl_log_net *log, htonl(atomic_inc_return(&log->global_seq)))) goto nla_put_failure; +#if IS_ENABLED(CONFIG_NF_CONNTRACK) if (ct && nfnl_ct->build(inst->skb, ct, ctinfo, NFULA_CT, NFULA_CT_INFO) < 0) goto nla_put_failure; +#endif if ((pf == NFPROTO_NETDEV || pf == NFPROTO_BRIDGE) && nfulnl_put_bridge(inst, skb) < 0) -- 2.26.3