From nobody Tue Apr 7 12:21:37 2026 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 97AAF3C3456 for ; Fri, 3 Apr 2026 18:53:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775242429; cv=none; b=ADFOS9uAV77yyR0VULtO2XcXODzCFhb+DEG1y5hf+Ttmw4fHl0CVFLyRPiIj0pWEYOGF7pDj+KFq7JRzyAM/e+Mvohh0+nALctgPP1tVG4RdjMKH64Pl0Un4GSwAUr5dwdR+7lC7Up8LKpn3RwQfSZixZwDcZR8SKBpyQ5KMgSA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775242429; c=relaxed/simple; bh=/jVVlaYZFAwlin52R+2Ey9DOou+ZLFQYY+l+kE8eSHc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mszJkJyG3pCKma2cj09h4sn8MeGeIacAbaUfXYZuhuA3PlzWRNbiDhce3j7OYzmlEetCU+B9JZyMy95014YtEMO3d8Ly6v2QL5NA0KeFpycEcsueQIj62OrpaoQoVY2YntUc9QUTv0HJ8DhYlMhQFQw7t3kK0/uOHZ5xIEoLbo0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KtK5YBSn; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KtK5YBSn" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-43ba1f3fa7eso2132324f8f.2 for ; Fri, 03 Apr 2026 11:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775242427; x=1775847227; 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=maeNfYkM/3PGyOug4UakihZPv8oRILxVm2J09dLBdmo=; b=KtK5YBSnLPeC3oqAHwG2IFdDU6RrqXWDmlCpSUYaeo9plyoWLTvCpiB4IpOzZMW8XP 8DHrhlwvzYkpfb2eZUIkV71iwRK5X4IMSo6LJOoSqCmz2HyjDcheHkaYyBcr0YHnCzap zfIUBtw6W8e1+w+lnicYEE6M+Uz3R8DvyZL7XXhpzfxfXnWg79iwr2aNO94/sF8FmIJ8 oL+HvTWvZIFMxMqp/LKsdf3tm8cs8zTTrNMPukaOEB83JpbPH8qSxwFlvzsZMMuwoQbT Uf4KPTLab4Nx1NudHdA0sW7Bi8sEAur4hLgl2t1QiFKvBjcvmxFfpHeP87fL3C594O5T dTsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775242427; x=1775847227; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=maeNfYkM/3PGyOug4UakihZPv8oRILxVm2J09dLBdmo=; b=llekR2yG7l1n7ITiTP4UUwit5VS9HGg3otK2CLek5xTF7ND411b3dA+Q0wXrtk5Srv aok7/5EzvzCwrxzxv1cyNaY6PtC8mNCfkx+jzHyLFIkfvA6en1VnIPRw1ersFmCj9CjV lgeRp/NCFkQm9mPvzq2io+k/MponsR9JICvHMzjdc/pPkqGZAh1GVcJFtXi2dHnbJKNB Yumq64xazNc6XDB5ttauGM7kJ01A2HTzGaK3lE0mmgPkqtUOYJDi+kPnviXLut4AriV7 cafK5wJIsl+jOJYgbCsm67yUGYZXIq3XXLtaGVJVfoQThz100Z+O/aqo31QenU+Pxu98 IbCQ== X-Forwarded-Encrypted: i=1; AJvYcCUirW2XA/c8sMIrU5zD9DLMnejcERb64AKh8T9DwNj5guM/RowzkWlCthTbB4DNn6f+BDGchJ2bpu0ACTc=@vger.kernel.org X-Gm-Message-State: AOJu0YzN9PmBflTymapg9+yDkNnTvkdz850kZQm3IB2fWvV2oGaiF/Kn 19CWSgRTeeHIf9gJS+L7gzV8hAiDBNxly/a3R5Dibkpqlhe6S5jaA8Wn X-Gm-Gg: AeBDieu/PSjdlA43BGZU4rCZnpkdmOHXMfaIiF56wXv2nvaNOV5Ba309GoolvrAKORs aVKJRe4nbGgn0ZFRZEjesHckaHsg5S/FyPX4YmemOhVkhi52NibZAdkSgR6dNPBu8inYGjFH4a4 dD467EBZHUM9jT8g5rVbJ9yBlI2LbTwVoNzGW6kdRNxjFBOh1ExW9O6+PjUoRMk1h631GdTwZdF lakigoE7bd8hJVHmkAy6zuchub3B861pgsU5HYrp7ktvxahfxr2GDUm8Mb7XBTFj5FEgdoelmxa PwEWDVEEOHVDPmYElbYCU9rwbNJWqZcP54GDho4Lea6Fqvzzk8ZVNY4zLOGL2NALIUxEn76O8Un RyCeZVF/G198LScinIcBhfiSKnAgmD+YOJYOgRprZYhEjevmsJdbYc6cfYI+2xxLVCRmS+sq3wB hyi9u6iEOkoj8IwLsqYWXC5+4Fpjg/j44L4URId2aQnOjP2L6PUaClD9dWHq4HvOo95lALMR3qk iUkdJttAYvSMHBX1g9mCBRH/vb4BUs1Y0+R7mXeZ49KCadq960= X-Received: by 2002:a05:6000:401f:b0:43d:2be:e4e with SMTP id ffacd0b85a97d-43d292ff520mr6572751f8f.46.1775242426634; Fri, 03 Apr 2026 11:53:46 -0700 (PDT) Received: from localhost.localdomain (cpe-188-129-81-72.dynamic.amis.hr. [188.129.81.72]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d1e4d289asm17855349f8f.19.2026.04.03.11.53.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 Apr 2026 11:53:46 -0700 (PDT) From: Marino Dzalto To: pablo@netfilter.org, fw@strlen.de Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Marino Dzalto Subject: [PATCH] netfilter: xt_dscp: replace -EDOM with -EINVAL and unify match functions Date: Fri, 3 Apr 2026 20:53:37 +0200 Message-ID: <20260403185337.87676-1-marino.dzalto@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Marino Dzalto Signed-off-by: Marino Dzalto --- net/netfilter/xt_dscp.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/net/netfilter/xt_dscp.c b/net/netfilter/xt_dscp.c index fb0169a8f..00137bff3 100644 --- a/net/netfilter/xt_dscp.c +++ b/net/netfilter/xt_dscp.c @@ -25,16 +25,12 @@ static bool dscp_mt(const struct sk_buff *skb, struct xt_action_param *par) { const struct xt_dscp_info *info =3D par->matchinfo; - u_int8_t dscp =3D ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT; + u8 dscp; =20 - return (dscp =3D=3D info->dscp) ^ !!info->invert; -} - -static bool -dscp_mt6(const struct sk_buff *skb, struct xt_action_param *par) -{ - const struct xt_dscp_info *info =3D par->matchinfo; - u_int8_t dscp =3D ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT; + if (xt_family(par) =3D=3D NFPROTO_IPV4) + dscp =3D ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT; + else + dscp =3D ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT; =20 return (dscp =3D=3D info->dscp) ^ !!info->invert; } @@ -44,7 +40,7 @@ static int dscp_mt_check(const struct xt_mtchk_param *par) const struct xt_dscp_info *info =3D par->matchinfo; =20 if (info->dscp > XT_DSCP_MAX) - return -EDOM; + return -EINVAL; =20 return 0; } @@ -74,7 +70,7 @@ static struct xt_match dscp_mt_reg[] __read_mostly =3D { .name =3D "dscp", .family =3D NFPROTO_IPV6, .checkentry =3D dscp_mt_check, - .match =3D dscp_mt6, + .match =3D dscp_mt, .matchsize =3D sizeof(struct xt_dscp_info), .me =3D THIS_MODULE, }, --=20 2.50.1 (Apple Git-155)