From patchwork Wed Mar 5 17:09:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Michal_Koutn=C3=BD?= X-Patchwork-Id: 14003051 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) (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 893351AAE1E for ; Wed, 5 Mar 2025 17:09:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.67 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741194584; cv=none; b=NQgXb8Kgx5ozD7kk9Xi6SYOPDC+NSa8tlR4Ky6rCRVAnLFxt+Ufnc9s1cHNC6HOcM/NwkPwH2Q3DVacFbidIxv+nxgypk/UtkeM/f6vKjdXU/fBz2p+Sq9f2s525Is/0qUejLTrdmgKp5sUJ2PPx+cMFAiqtPjvvR7hbMk517/M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741194584; c=relaxed/simple; bh=irFcCVMJ+YoW6k8byXnRJIVW9wTUS4yGDTwhsoaB6Ak=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=HC89aS4MyyK0qOx+5rO5csPyNPei8FowBaP85b97Z8D+6MeJdd0oIYw4yWZ7CN6C1/ugm3Z4a/Wa0nkBngnG6C1pe6gekERxbwBLUxowmI8+o9riUusVs5QgsbIPhHA9y0lLIdxZDqt5/ri3NE+t/q+K7pMcQNhUd1sTXGLAmGs= 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=P1p3UOO0; arc=none smtp.client-ip=209.85.128.67 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="P1p3UOO0" Received: by mail-wm1-f67.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso76723395e9.1 for ; Wed, 05 Mar 2025 09:09:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741194579; x=1741799379; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8Xwduz/qNPiyy4RhwG9d9PScJsmgmVdCqCQSC6jOGw4=; b=P1p3UOO0b9YDJTFpWR4YE+ZSKZf6Xcn52yudVG+sPHwyBxBtardW009r9baCZcBeB4 4YrBwUNx2JnWKUZCwE8P5GXIHIEPQ0jNvCevdy2YOChbqBHkzpHt/1wzFn5RYouw4lg7 Ubnyj/AmJTt084JQMIhTcWp0jpVFjR0Xndt2RDe864mTy2ddPAAr0onst3U6rKkFxD45 H0M4bgWyKxC98MlJmxb9oAlG/J9F2VNQt4FJxc+tUtjyiDfKCDHtPn8v130bldZUxkdd 1L/Pie03mBgGdJDVfupW8ScDCv5mNHuWB5VmdaSSZ68xZEXatoTBkzENiNCy/KsCr8T5 oqQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741194579; x=1741799379; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8Xwduz/qNPiyy4RhwG9d9PScJsmgmVdCqCQSC6jOGw4=; b=SqqETsjd44pZ8CAuHnspVxfP3qebCR8TE2m0UQAq/IvJJiR7iVNewTOsnkTxI791xu dq+dUCPSXuct0lA4VyZy0fVHvv2r4NVYm7os/Ix+LHPoICqgtrMbatR4G9n8ZyWYfgXM 0tpIPVnnbLZz1Zv4mmAvyUYfiAUGakVTmwL1budltehKzGe4rFuxTeN8ByUQRjSWQB+n mozY4C6zu9rJAkkmnUMnbHtZZal49JRCx0uaRMureAjSuquCtVomMz6WFGsBQ1Bl7kZs DKfmOqnR6zKkl6nLKy/rjlEHuNC5eXQDnNmK+Mqhkl9KYvTQsARxQJMZWD4hDU63eZp6 BiDA== X-Forwarded-Encrypted: i=1; AJvYcCW02teZi1OchPtZsjy9hmhDJzNd3pGOcWb3LPRFmKm3ed7cr2/wwL+nEldtJgOyKSgbJLlEwBg=@vger.kernel.org X-Gm-Message-State: AOJu0YyhWl/B1+Tyr6Uj0YHjbaLJb2Y5auUBRc+rS072X0qZwVsJAPxr 6Suln0gxI5EX+bnrNbc9PwjafqxwIbfdH+l60Zb7PUfDYhbFJXKcAzt5Y60QTbI= X-Gm-Gg: ASbGnctO5tYOiIA7rTFBNz4fXJU3Blo0O63v64kB0ogr2ZOiiEvjnEeNku+9eb8kFUU kSc8QkmqsGA6xiZcp0mDvJ5oyIYSR289WCoPirPrT7fF5k2xEU6n4HOgg9hqiX3QtWAgbkKHrPG /jsXWfsCZN7wgIykdIRPK95USg2JW6WJPwcA8V8plA/uylTDuv7Hruk9QSe0hZbXvebCk9QqcOy +EvcpO/9EO1xyuIYldlW7e5yvlOgy7Zsgzi7f2skZOJHJtJNLpv9HkTzopFIPoBtNAi8/c1Y13W CEdCVxed9Pn0Asj/CphRNY+xE2tHlEtv/n1pxC7kliz1lHI= X-Google-Smtp-Source: AGHT+IHtALOlZRY8OEkAfMy/8LP4eO3WEczzKfPhSQDmbP+zhNlJTZUTR0mJ/R+5FMnzK/l5vhD0mw== X-Received: by 2002:a05:600c:1d01:b0:43b:cf12:2ca6 with SMTP id 5b1f17b1804b1-43bd292e1cemr28484335e9.1.1741194578635; Wed, 05 Mar 2025 09:09:38 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6ceesm21323862f8f.45.2025.03.05.09.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 09:09:38 -0800 (PST) From: =?utf-8?q?Michal_Koutn=C3=BD?= To: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Pablo Neira Ayuso , Jozsef Kadlecsik , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , cgroups@vger.kernel.org, Jan Engelhardt , Florian Westphal , =?utf-8?q?Mic?= =?utf-8?q?hal_Koutn=C3=BD?= Subject: [PATCH v2] netfilter: Make xt_cgroup independent from net_cls Date: Wed, 5 Mar 2025 18:09:35 +0100 Message-ID: <20250305170935.80558-1-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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 non-trivial clsid. Link: https://lists.opensuse.org/archives/list/kernel@lists.opensuse.org/thread/S23NOILB7MUIRHSKPBOQKJHVSK26GP6X/ Signed-off-by: Michal Koutný --- net/netfilter/Kconfig | 2 +- net/netfilter/xt_cgroup.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) Changes from v1 (https://lore.kernel.org/r/20250228165216.339407-1-mkoutny@suse.com) - terser guard (Jan) - verboser message (Florian) - better select !CGROUP_BPF (kernel test robot) base-commit: dd83757f6e686a2188997cb58b5975f744bb7786 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..c3055e74aa0ea 100644 --- a/net/netfilter/xt_cgroup.c +++ b/net/netfilter/xt_cgroup.c @@ -23,6 +23,13 @@ MODULE_DESCRIPTION("Xtables: process control group matching"); MODULE_ALIAS("ipt_cgroup"); MODULE_ALIAS("ip6t_cgroup"); +#define NET_CLS_CLASSID_INVALID_MSG "xt_cgroup: classid invalid without net_cls cgroups\n" + +static bool possible_classid(u32 classid) +{ + return IS_ENABLED(CONFIG_CGROUP_NET_CLASSID) || classid == 0; +} + static int cgroup_mt_check_v0(const struct xt_mtchk_param *par) { struct xt_cgroup_info_v0 *info = par->matchinfo; @@ -30,6 +37,11 @@ static int cgroup_mt_check_v0(const struct xt_mtchk_param *par) if (info->invert & ~1) return -EINVAL; + if (!possible_classid(info->id)) { + pr_info(NET_CLS_CLASSID_INVALID_MSG); + return -EINVAL; + } + return 0; } @@ -51,6 +63,11 @@ static int cgroup_mt_check_v1(const struct xt_mtchk_param *par) return -EINVAL; } + if (!possible_classid(info->classid)) { + pr_info(NET_CLS_CLASSID_INVALID_MSG); + return -EINVAL; + } + info->priv = NULL; if (info->has_path) { cgrp = cgroup_get_from_path(info->path); @@ -83,6 +100,11 @@ static int cgroup_mt_check_v2(const struct xt_mtchk_param *par) return -EINVAL; } + if (info->has_classid && !possible_classid(info->classid)) { + pr_info(NET_CLS_CLASSID_INVALID_MSG); + return -EINVAL; + } + info->priv = NULL; if (info->has_path) { cgrp = cgroup_get_from_path(info->path);