From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) (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 409CC27181C for ; Fri, 28 Feb 2025 16:52:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.66 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761542; cv=none; b=mhMtuGw5qe8aoZn/wf+gxms9QwxLDwCpo2NQA0bOuA/SF1fptLzojNV2MF3S/a3GagLGe5C316i3zXg/IDhMSsjXT8uaIq4lLQ7R4fPx2doIuJ6qBGwgTgJ941vruPREvzwS6UEGGTZt6QBiRR+Bf4cKVRc3a2+oK0AkTFe8V54= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761542; c=relaxed/simple; bh=NsYtIP9Mw2b/nhaNRRDG6qj+beqFgzVf9yFx5qbgPTQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=gfhUQVZJQWmK1EZhquGnbz1SkXfIRqzeno8JA1X1Nw2czyzOq/YJ9dJYR9dw2UIElNka55sJzJFf3alN7uhVNS7mCcyh3UGzQFeTnzpceviD6UaxQ2BC0qqc5lPeGNhj0c3A7b7baVNXq522LtgAoKk+nXLIQroJASRzffpk6Vo= 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=YTkDYpJS; arc=none smtp.client-ip=209.85.218.66 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="YTkDYpJS" Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-abf3d64849dso83815966b.3 for ; Fri, 28 Feb 2025 08:52:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1740761538; x=1741366338; 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=DMEGjq6WjEVsV0tBdx2rpYvL0pVPJ8Xct6E1Q4Bt1js=; b=YTkDYpJS9a21ha422hVk0M8FVi/r7w5KDTgauOPejHxA01oz21EZNje4EDQpBVgejx G3uvmDgSjBjnPvTWQsCnaqX2miIy2PwJL+Wo6rqlHmcWfe9dha4dtAaPp7Uj0ixE4nK6 IovPR0tWI2cyyilIJNq32XUiwoEtmmaNOTbWYfo+czwwuM234dNhSYgGYot0QW5JvCXN C9dV/Uy8A08m623K5emrCA6nu19+2NwAOxsipR/93D8rrujFYQZOPbPTvC3yGgvpyvtw qRsHLUbM+eAjLjb4g+kck3HAgMjOziYyQag1o+3lMyZ7bqlfUB6SMMndfb1lOoWrbUsY B10g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740761538; x=1741366338; 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=DMEGjq6WjEVsV0tBdx2rpYvL0pVPJ8Xct6E1Q4Bt1js=; b=HgmvouC3zlxEWzVRDmJscAxKQAhZe8NgsVm66EnigAp9jU04kKkrFBN1eXDUsnME/m nMkZodjg61tvI4aM3ylF8sAz97qu4P3OvPUBwm86HjactbdQrFbSp8A3tkZto7ArpIXM O0VHNCpQyBc+zMTMJno7MdzLclGrh+WPWZK5X2aBx/CGBX7lU4AOxdRcZNMsfNQXwVXH 0yi/mQ7a87KUnC9SFbsIS7js9RbGRn8/EYvhJWXhnz1o6ywda5LDHju3E+Gow1Qck4dn AOEFdv+hd7lql7dFme3e6yGSGRTyAZwZuk08o1tt83OpLcUWLkX7R3tyt2fJglRVbWUZ GeHg== X-Forwarded-Encrypted: i=1; AJvYcCXCqweRplBBISMTzvDIsGQNrdbyPTxpeKwTFiI4rwwi7PF8U2E14pFCBcOODmXgZBt4ufG3aQ82@vger.kernel.org X-Gm-Message-State: AOJu0YwWQYhpoHjZNasWtnwDZfYE2hUiYkQDn8eoIBIgI6Ed1aDG0dtD v37aH2JMfxkfaxJgKrpyLfXSt3SEV+Betvm/zGx21gz+YpncDPK4nM+zQwlhvM8= X-Gm-Gg: ASbGncvUETzMOZBNIu5pvjsxfBMxmkEObwNImAHudCBxzgqksyukvfDJXSigkHKBvbD jUFeMpEiE8EkqY1tMn/Tn90mEz/fBFaedAvyhd+jft9wNWS0FrAAiqQI/DAeXVNQmPRoRySruOr rDf26UUzDXvxB67BNY3n/YQalm9slS97OXYV8PcEz8BNqN9jZRph2Y1GZ2cBgvd786VkN+PaJ0v 2a6qqKY1gWNvOZw5KrKn2AhDotVXxUWg87exi3xAgwM47MR81jgOOANovhK1/jNKnIgVx/mF8Yx KdqHR2LRL4EcEK7laGiiQ4pA4D8M X-Google-Smtp-Source: AGHT+IEs+LalzKtbPFpkKQgFWFd0Lu/RhKgnHSlViKu4ecCAJmjCZ0T6cL/fwlL89/H2Lwl2Cv9zFw== X-Received: by 2002:a05:6402:2790:b0:5df:6a:54ea with SMTP id 4fb4d7f45d1cf-5e4d6adc7a0mr7561214a12.11.1740761538383; Fri, 28 Feb 2025 08:52:18 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c3b6d252sm2764784a12.26.2025.02.28.08.52.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 08:52:17 -0800 (PST) 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: Pablo Neira Ayuso , Jozsef Kadlecsik , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , cgroups@vger.kernel.org Subject: [PATCH] netfilter: Make xt_cgroup independent from net_cls Date: Fri, 28 Feb 2025 17:52:16 +0100 Message-ID: <20250228165216.339407-1-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Adjust Kconfig 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 | 1 - net/netfilter/xt_cgroup.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index df2dc21304efb..af9350386033e 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -1180,7 +1180,6 @@ config NETFILTER_XT_MATCH_CGROUP tristate '"control group" match support' depends on NETFILTER_ADVANCED depends on CGROUPS - select CGROUP_NET_CLASSID 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..f30a62e803d22 100644 --- a/net/netfilter/xt_cgroup.c +++ b/net/netfilter/xt_cgroup.c @@ -23,6 +23,14 @@ MODULE_DESCRIPTION("Xtables: process control group matching"); MODULE_ALIAS("ipt_cgroup"); MODULE_ALIAS("ip6t_cgroup"); +static bool possible_classid(u32 classid) +{ + if (!IS_ENABLED(CONFIG_CGROUP_NET_CLASSID) && classid > 0) + return false; + else + return true; +} + static int cgroup_mt_check_v0(const struct xt_mtchk_param *par) { struct xt_cgroup_info_v0 *info = par->matchinfo; @@ -30,6 +38,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("xt_cgroup: invalid classid\n"); + return -EINVAL; + } + return 0; } @@ -51,6 +64,11 @@ static int cgroup_mt_check_v1(const struct xt_mtchk_param *par) return -EINVAL; } + if (!possible_classid(info->classid)) { + pr_info("xt_cgroup: invalid classid\n"); + return -EINVAL; + } + info->priv = NULL; if (info->has_path) { cgrp = cgroup_get_from_path(info->path); @@ -83,6 +101,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("xt_cgroup: invalid classid\n"); + return -EINVAL; + } + info->priv = NULL; if (info->has_path) { cgrp = cgroup_get_from_path(info->path); base-commit: dd83757f6e686a2188997cb58b5975f744bb7786 -- 2.48.1