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=-13.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED,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 9691CC432BE for ; Tue, 27 Jul 2021 19:00:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D69560F6E for ; Tue, 27 Jul 2021 19:00:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231960AbhG0TAq (ORCPT ); Tue, 27 Jul 2021 15:00:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230182AbhG0TAo (ORCPT ); Tue, 27 Jul 2021 15:00:44 -0400 Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4817C061760 for ; Tue, 27 Jul 2021 12:00:43 -0700 (PDT) Received: by mail-oi1-x22c.google.com with SMTP id q6so510143oiw.7 for ; Tue, 27 Jul 2021 12:00:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fYGKLH2SgAMa80yTiG4bFU3GsKrGRgA34J7Dev7x+rU=; b=xL62K6dOLLMIwoHIp2G0bPmyrqI+lDkDfv3po0DiDXcxRBxfSuUC8lDq6X9VsJeCF9 QuEXb76Vr2ZG0D3mdtxDF2Eyt+egoqaB4mxP3DsFen5lP+TZ5MGkULtTM4QBa8Kdb3zE AcFdjBpFb/ZhWl49yo9eUXp4O/evaiqSx3jCI= 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=fYGKLH2SgAMa80yTiG4bFU3GsKrGRgA34J7Dev7x+rU=; b=s2hM3Q0sU+/CduHLCH4LB4/sE43PcqSLf3DL6hg4BjsvHdmaFk5ygUMuNA0koL8NYe rai57Vs5hpqfeXNy+2Vd0tDYHtaKSVNJfWAtSViO7dxidJ5dm+pBuTv0dPBfB+YT/TLT vCN7m0R2rF53rBdjXQS78y+XQDsN5K3w3uxWsyswAUEVXqZFSZX+G9jfbX1vEaOKFRzm YWg/eNSzoFl+k8VIVKr34qwd6rRnHCVrUbzRsCioGq35d4AjYN2KaMIfT6VJyHYs9sCo z0HlNDDzyRjWaLeO7esDopR2aIOyrTmV1v127uimV+LdzhhIJUiKSSpNzbUcI9UbPvOC b3AA== X-Gm-Message-State: AOAM533MJygTo2pKfR+lkAOaCKKMiyxMXUgVLzreDcrEW6lhSujW7caJ JYVH7kMV1pq/aRhX9wW4h2zitg== X-Google-Smtp-Source: ABdhPJxqdOOz+tMCEb/1DbeyMqlSCbF3DyI1dSE0BciIltK+55JRRLTNF7EIpB2R64w+UZNzw9tVeA== X-Received: by 2002:aca:accf:: with SMTP id v198mr15948296oie.14.1627412441833; Tue, 27 Jul 2021 12:00:41 -0700 (PDT) Received: from localhost.localdomain (65-36-81-87.static.grandenetworks.net. [65.36.81.87]) by smtp.gmail.com with ESMTPSA id i10sm248897ood.48.2021.07.27.12.00.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Jul 2021 12:00:41 -0700 (PDT) From: Kyle Bowman Cc: kernel-team@cloudflare.com, Alex Forster , Kyle Bowman , Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Jakub Kicinski , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] netfilter: xt_NFLOG: allow 128 character log prefixes Date: Tue, 27 Jul 2021 14:00:00 -0500 Message-Id: <20210727190001.914-1-kbowman@cloudflare.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Forster nftables defines NF_LOG_PREFIXLEN as 128 characters, while iptables limits the NFLOG prefix to 64 characters. In order to eventually make the two consistent, introduce a v1 target revision of xt_NFLOG that allows userspace to provide a 128 character NFLOG prefix. Signed-off-by: Alex Forster Signed-off-by: Kyle Bowman --- include/uapi/linux/netfilter/xt_NFLOG.h | 11 ++++ net/netfilter/xt_NFLOG.c | 73 +++++++++++++++++++++---- 2 files changed, 73 insertions(+), 11 deletions(-) diff --git a/include/uapi/linux/netfilter/xt_NFLOG.h b/include/uapi/linux/netfilter/xt_NFLOG.h index 517809771909..3f1119a2e522 100644 --- a/include/uapi/linux/netfilter/xt_NFLOG.h +++ b/include/uapi/linux/netfilter/xt_NFLOG.h @@ -3,6 +3,7 @@ #define _XT_NFLOG_TARGET #include +#include #define XT_NFLOG_DEFAULT_GROUP 0x1 #define XT_NFLOG_DEFAULT_THRESHOLD 0 @@ -22,4 +23,14 @@ struct xt_nflog_info { char prefix[64]; }; +struct xt_nflog_info_v1 { + /* 'len' will be used iff you set XT_NFLOG_F_COPY_LEN in flags */ + __u32 len; + __u16 group; + __u16 threshold; + __u16 flags; + __u16 pad; + char prefix[NF_LOG_PREFIXLEN]; +}; + #endif /* _XT_NFLOG_TARGET */ diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c index fb5793208059..82279a6be0ff 100644 --- a/net/netfilter/xt_NFLOG.c +++ b/net/netfilter/xt_NFLOG.c @@ -39,6 +39,28 @@ nflog_tg(struct sk_buff *skb, const struct xt_action_param *par) return XT_CONTINUE; } +static unsigned int +nflog_tg_v1(struct sk_buff *skb, const struct xt_action_param *par) +{ + const struct xt_nflog_info_v1 *info = par->targinfo; + struct net *net = xt_net(par); + struct nf_loginfo li; + + li.type = NF_LOG_TYPE_ULOG; + li.u.ulog.copy_len = info->len; + li.u.ulog.group = info->group; + li.u.ulog.qthreshold = info->threshold; + li.u.ulog.flags = 0; + + if (info->flags & XT_NFLOG_F_COPY_LEN) + li.u.ulog.flags |= NF_LOG_F_COPY_LEN; + + nf_log_packet(net, xt_family(par), xt_hooknum(par), skb, xt_in(par), + xt_out(par), &li, "%s", info->prefix); + + return XT_CONTINUE; +} + static int nflog_tg_check(const struct xt_tgchk_param *par) { const struct xt_nflog_info *info = par->targinfo; @@ -51,30 +73,59 @@ static int nflog_tg_check(const struct xt_tgchk_param *par) return nf_logger_find_get(par->family, NF_LOG_TYPE_ULOG); } +static int nflog_tg_check_v1(const struct xt_tgchk_param *par) +{ + const struct xt_nflog_info_v1 *info = par->targinfo; + + if (info->flags & ~XT_NFLOG_MASK) + return -EINVAL; + if (info->prefix[sizeof(info->prefix) - 1] != '\0') + return -EINVAL; + + return nf_logger_find_get(par->family, NF_LOG_TYPE_ULOG); +} + static void nflog_tg_destroy(const struct xt_tgdtor_param *par) { nf_logger_put(par->family, NF_LOG_TYPE_ULOG); } -static struct xt_target nflog_tg_reg __read_mostly = { - .name = "NFLOG", - .revision = 0, - .family = NFPROTO_UNSPEC, - .checkentry = nflog_tg_check, - .destroy = nflog_tg_destroy, - .target = nflog_tg, - .targetsize = sizeof(struct xt_nflog_info), - .me = THIS_MODULE, +static void nflog_tg_destroy_v1(const struct xt_tgdtor_param *par) +{ + nf_logger_put(par->family, NF_LOG_TYPE_ULOG); +} + +static struct xt_target nflog_tg_reg[] __read_mostly = { + { + .name = "NFLOG", + .revision = 0, + .family = NFPROTO_UNSPEC, + .checkentry = nflog_tg_check, + .destroy = nflog_tg_destroy, + .target = nflog_tg, + .targetsize = sizeof(struct xt_nflog_info), + .me = THIS_MODULE, + }, + { + .name = "NFLOG", + .revision = 1, + .family = NFPROTO_UNSPEC, + .checkentry = nflog_tg_check_v1, + .destroy = nflog_tg_destroy_v1, + .target = nflog_tg_v1, + .targetsize = sizeof(struct xt_nflog_info_v1), + .me = THIS_MODULE, + } }; static int __init nflog_tg_init(void) { - return xt_register_target(&nflog_tg_reg); + return xt_register_targets(nflog_tg_reg, ARRAY_SIZE(nflog_tg_reg)); } static void __exit nflog_tg_exit(void) { - xt_unregister_target(&nflog_tg_reg); + xt_unregister_targets(nflog_tg_reg, ARRAY_SIZE(nflog_tg_reg)); } module_init(nflog_tg_init); -- 2.32.0