From nobody Fri Dec 19 20:23:51 2025 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60E51201259 for ; Tue, 1 Apr 2025 11:57:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743508670; cv=none; b=jpuXm6EoB8U8EyYMEiywC6DRUBicPXt1hTES9Iih5L8TGfJMyRMceLxI0mDRQJjEQJ1qUVGsh3KPgUQoXAO+9OV2n+w69ihS0PjEZ9a+GtJBIF3UkmcMr4ekpZEKGJCpt7HDtPafA/CJGwYqeYViTb5p1ygE1FKtajOVwm2C1dc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743508670; c=relaxed/simple; bh=0nF+xuWoBYdZV0D86oQiQH2Vwm5eF02ZJMZE7MDdRmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hH31BZMr/p184SntqzFDv7ofEt2HZgfwHSVlaFvb10H4VHDBnXuQpD9FcoD7BHwlKv1Fn2ddgZAnZQlWKzZ9biQh8eaocNnZQQLxnfJy/U7yWvYN/QeWebziX2G/UUCHzp/WWwCj6uSCUePSq24J4d8FibQiA6mcZgaAzk+QWjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=DwaWVLd3; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="DwaWVLd3" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3914bc3e01aso3068216f8f.2 for ; Tue, 01 Apr 2025 04:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1743508666; x=1744113466; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QES0z4GKQZ/03VJyRHrdN6C5fCNjDAjguyeu9jRmFsw=; b=DwaWVLd3S1DkuWMm1lSXsFQg7ulbNgQpfwCCVUiCFybu6QOp397A3uFhgvrfjkVOh/ RVQ2Thxkn+by3rPERCqRA78wx7CLJ+hRMhQ0qRRz+Ol5VlCG2HfVAVeDtELVQIX/n0HF gVJSfT6vpH1OJYLEI0anrTVXoW5Z1pD6iqieHS9HQKhM6ot9YN4Kz0zluKJJGi9w/zeQ g5pnNQwwJK0MzsSNSJmm+EIuMswc/GOpYD3H+aiWhyqblo2VOkfONqFBOt+JrrauoSWk 6upiWFPQWzMFmYikfsMHiqe12GWyC3noYHv7QqHVtyLQgClJ7X4IIbmIej5O24TDmVpx AyGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743508666; x=1744113466; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QES0z4GKQZ/03VJyRHrdN6C5fCNjDAjguyeu9jRmFsw=; b=rkkicRgOO9Y13n+wEb1+1G9LN7576haEZyL5+J5zmShbCRSiLiGAhnTGq+7kwDd5Fe xfOVTNDLz64iz2DSrXVKGfGccl8J1X/B5ln1Se5jL2Zk+XhN2rgin0/SC88jnHO1YOfc m3sRZ9w+iqXTgbAzfiR+n9y5G0kXeByTg2GIbVQNbjylndehfBiNWdQ/ZOKxFHFShCF0 wbsSlv5j+cZhjqfPq0K1gGYU6rrxmT7+bPsIXWPJFNAehtZTj0GtiltbBb52bKbbdR+h GiMg6f9HDgwX9ai2FRvafiOPlGEdZjO6Ry6anYKPXm+uayj5AfkR9wfYfwsDHUrsbVKg VqgA== X-Forwarded-Encrypted: i=1; AJvYcCValy9UEDhM89B1UNOwgqFw0kmUIYrmYDHtlhHPuyrUfpy3fKhCuZE9CwHkF4nRegpnkPCrkLTj3SxZEDY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1UyNgQcqAt9AyhN4wAckP4v65tpt0B138qvdpyEtIgot4i9Ma zGI3FvIZ9n7if9OUXFqcMsckk3VVxUXF6RE3Zy3BnvXhNpKbItU+V4elVYQNuM8= X-Gm-Gg: ASbGnctVrMsmSzxHtcGOEp12Xps4qt0/CxYcbAiLXC/JVDdN93TXvtoHFV3b7itrobn 2RNe7PF3qWQ00Pk8EbeWS7M1IQkpiuRkMkmpqs6ReA0ugOhuZOVdEBAXpH6GHv+JSqnNRKxNbad YjsNGGC4zuwk61axhZuMjvcEcRYQ5ZD1XMgDDFep7lYoGTu2ELsVSOhDKUWEmHZ3wnbDwuUNsTR RGNcb213OJ/uQiYiIGms+K7GcIDLatGTLcQR0VOEIB2bLeRP9ymIkD+2MQ7rauyyF26avaJM9N6 8bjcs7uNS2vDBumvDaDes244AyBsaQcTw86WiGzCe3WDd85qfFXpMIKS0Q== X-Google-Smtp-Source: AGHT+IGbkEZGFrvbkbtiGNNuU6I3p4pFZhW/qtEV+/o0HWkjf6ohu6IRuXXV/ov23+gGbTey36rZSg== X-Received: by 2002:a5d:5f45:0:b0:391:2306:5131 with SMTP id ffacd0b85a97d-39c1211b902mr10393579f8f.45.1743508666586; Tue, 01 Apr 2025 04:57:46 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b7a42a3sm14130150f8f.91.2025.04.01.04.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Apr 2025 04:57:46 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Michal=20Koutn=C3=BD?= , Jan Engelhardt , Florian Westphal , Pablo Neira Ayuso , Jozsef Kadlecsik , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Subject: [PATCH v3 1/3] netfilter: Make xt_cgroup independent from net_cls Date: Tue, 1 Apr 2025 13:57:30 +0200 Message-ID: <20250401115736.1046942-2-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250401115736.1046942-1-mkoutny@suse.com> References: <20250401115736.1046942-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The xt_group matching supports the default hierarchy since commit c38c4597e4bf3 ("netfilter: implement xt_cgroup cgroup2 path match"). The cgroup v1 matching (based on clsid) and cgroup v2 matching (based on path) are rather independent. Downgrade the Kconfig dependency to mere CONFIG_SOCK_GROUP_DATA so that xt_group can be built even without CONFIG_NET_CLS_CGROUP for path matching. Also add a message for users when they attempt to specify any clsid. Link: https://lists.opensuse.org/archives/list/kernel@lists.opensuse.org/th= read/S23NOILB7MUIRHSKPBOQKJHVSK26GP6X/ Cc: Jan Engelhardt Cc: Florian Westphal Signed-off-by: Michal Koutn=C3=BD --- net/netfilter/Kconfig | 2 +- net/netfilter/xt_cgroup.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index df2dc21304efb..346ac2152fa18 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -1180,7 +1180,7 @@ config NETFILTER_XT_MATCH_CGROUP tristate '"control group" match support' depends on NETFILTER_ADVANCED depends on CGROUPS - select CGROUP_NET_CLASSID + select SOCK_CGROUP_DATA help Socket/process control group matching allows you to match locally generated packets based on which net_cls control group processes diff --git a/net/netfilter/xt_cgroup.c b/net/netfilter/xt_cgroup.c index c0f5e9a4f3c65..66915bf0d89ad 100644 --- a/net/netfilter/xt_cgroup.c +++ b/net/netfilter/xt_cgroup.c @@ -23,6 +23,8 @@ MODULE_DESCRIPTION("Xtables: process control group matchi= ng"); MODULE_ALIAS("ipt_cgroup"); MODULE_ALIAS("ip6t_cgroup"); =20 +#define NET_CLS_CLASSID_INVALID_MSG "xt_cgroup: classid invalid without ne= t_cls cgroups\n" + static int cgroup_mt_check_v0(const struct xt_mtchk_param *par) { struct xt_cgroup_info_v0 *info =3D par->matchinfo; @@ -30,6 +32,11 @@ static int cgroup_mt_check_v0(const struct xt_mtchk_para= m *par) if (info->invert & ~1) return -EINVAL; =20 + if (!IS_ENABLED(CONFIG_CGROUP_NET_CLASSID)) { + pr_info(NET_CLS_CLASSID_INVALID_MSG); + return -EINVAL; + } + return 0; } =20 @@ -51,6 +58,11 @@ static int cgroup_mt_check_v1(const struct xt_mtchk_para= m *par) return -EINVAL; } =20 + if (info->has_classid && !IS_ENABLED(CONFIG_CGROUP_NET_CLASSID)) { + pr_info(NET_CLS_CLASSID_INVALID_MSG); + return -EINVAL; + } + info->priv =3D NULL; if (info->has_path) { cgrp =3D cgroup_get_from_path(info->path); @@ -83,6 +95,11 @@ static int cgroup_mt_check_v2(const struct xt_mtchk_para= m *par) return -EINVAL; } =20 + if (info->has_classid && !IS_ENABLED(CONFIG_CGROUP_NET_CLASSID)) { + pr_info(NET_CLS_CLASSID_INVALID_MSG); + return -EINVAL; + } + info->priv =3D NULL; if (info->has_path) { cgrp =3D cgroup_get_from_path(info->path); --=20 2.48.1