{"id":2219685,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2219685/?format=json","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.0/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260403185337.87676-1-marino.dzalto@gmail.com>","date":"2026-04-03T18:53:37","name":"netfilter: xt_dscp: replace -EDOM with -EINVAL and unify match functions","commit_ref":null,"pull_url":null,"state":"rejected","archived":true,"hash":"b1ff49a9e78bbdda9eecb11fcb423fc694446a1a","submitter":{"id":93048,"url":"http://patchwork.ozlabs.org/api/1.0/people/93048/?format=json","name":"Marino Dzalto","email":"marino.dzalto@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260403185337.87676-1-marino.dzalto@gmail.com/mbox/","series":[{"id":498663,"url":"http://patchwork.ozlabs.org/api/1.0/series/498663/?format=json","date":"2026-04-03T18:53:37","name":"netfilter: xt_dscp: replace -EDOM with -EINVAL and unify match functions","version":1,"mbox":"http://patchwork.ozlabs.org/series/498663/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219685/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","netfilter-devel@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=KtK5YBSn;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c09:e001:a7::12fc:5321; helo=sto.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-11613-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com\n header.b=\"KtK5YBSn\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=209.85.221.48","smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=gmail.com","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=gmail.com"],"Received":["from sto.lore.kernel.org (sto.lore.kernel.org\n [IPv6:2600:3c09:e001:a7::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fnSYb2MH4z1yCt\n\tfor ; Sat, 04 Apr 2026 05:53:55 +1100 (AEDT)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sto.lore.kernel.org (Postfix) with ESMTP id 14D6230089AD\n\tfor ; Fri, 3 Apr 2026 18:53:52 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 30FEE3CC9FC;\n\tFri, 3 Apr 2026 18:53:50 +0000 (UTC)","from mail-wr1-f48.google.com (mail-wr1-f48.google.com\n [209.85.221.48])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 823BC3C343C\n\tfor ; Fri, 3 Apr 2026 18:53:48 +0000 (UTC)","by mail-wr1-f48.google.com with SMTP id\n ffacd0b85a97d-43ba1f3fa7eso2132326f8f.2\n for ;\n Fri, 03 Apr 2026 11:53:48 -0700 (PDT)","from localhost.localdomain (cpe-188-129-81-72.dynamic.amis.hr.\n [188.129.81.72])\n by smtp.gmail.com with ESMTPSA id\n ffacd0b85a97d-43d1e4d289asm17855349f8f.19.2026.04.03.11.53.45\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Fri, 03 Apr 2026 11:53:46 -0700 (PDT)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775242429; cv=none;\n b=OBTJNMq3qxn1/CLtrcZCRdElqHS6MI3N9joHabdm7656CFflW5k8ZIyY0ptM+ocM2jFGIdmjD4GsG1vcD8xT6FtbooyljRPcMKptN7MmhfPqYs0lRdZxOqaWArDGeLub4B0Wb/kFgqkqRK/M5C2CRd6MEQb96dQkoYNY9HcRXUc=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775242429; c=relaxed/simple;\n\tbh=/jVVlaYZFAwlin52R+2Ey9DOou+ZLFQYY+l+kE8eSHc=;\n\th=From:To:Cc:Subject:Date:Message-ID:MIME-Version;\n b=mszJkJyG3pCKma2cj09h4sn8MeGeIacAbaUfXYZuhuA3PlzWRNbiDhce3j7OYzmlEetCU+B9JZyMy95014YtEMO3d8Ly6v2QL5NA0KeFpycEcsueQIj62OrpaoQoVY2YntUc9QUTv0HJ8DhYlMhQFQw7t3kK0/uOHZ5xIEoLbo0=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=gmail.com;\n spf=pass smtp.mailfrom=gmail.com;\n dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com\n header.b=KtK5YBSn; arc=none smtp.client-ip=209.85.221.48","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1775242427; x=1775847227;\n darn=vger.kernel.org;\n h=content-transfer-encoding:mime-version:message-id:date:subject:cc\n :to:from:from:to:cc:subject:date:message-id:reply-to;\n bh=maeNfYkM/3PGyOug4UakihZPv8oRILxVm2J09dLBdmo=;\n b=KtK5YBSnLPeC3oqAHwG2IFdDU6RrqXWDmlCpSUYaeo9plyoWLTvCpiB4IpOzZMW8XP\n 8DHrhlwvzYkpfb2eZUIkV71iwRK5X4IMSo6LJOoSqCmz2HyjDcheHkaYyBcr0YHnCzap\n zfIUBtw6W8e1+w+lnicYEE6M+Uz3R8DvyZL7XXhpzfxfXnWg79iwr2aNO94/sF8FmIJ8\n oL+HvTWvZIFMxMqp/LKsdf3tm8cs8zTTrNMPukaOEB83JpbPH8qSxwFlvzsZMMuwoQbT\n Uf4KPTLab4Nx1NudHdA0sW7Bi8sEAur4hLgl2t1QiFKvBjcvmxFfpHeP87fL3C594O5T\n dTsQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775242427; x=1775847227;\n h=content-transfer-encoding:mime-version:message-id:date:subject:cc\n :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date\n :message-id:reply-to;\n bh=maeNfYkM/3PGyOug4UakihZPv8oRILxVm2J09dLBdmo=;\n b=oQqDZFM16uFKCKezUwAlqnvSHHa15oJICEUEM/0ViehcuO+7/JMe+kX1gjVPpFIZ+C\n ZssCZ0XMfPs61uh3lF+3H+ZgoULVlKTNobnn8e57+kCrO8XkfZUBWHqHZ0cBV8i2DiW5\n gOjVv7K9xaq9f374oqJZnd4XW8zsqCRpDwz/NxwaOCahXwnp6t/yqVajZZteiyqfRD80\n VsOtwVzOItlNyeLKlfgl0ujNhwZBY3lZfuqIyZsF1chNx0b/QaLd8ZsHm4GyntwQymZQ\n EUQdO4cPXXNYIz5yzSq/snnQjat7YkP0SE4MgZ33iZuyy+Bc8WLxzKO/ZZT5uf0IE32n\n B/OA==","X-Gm-Message-State":"AOJu0Ywx1FIux4RZax8qQMLiqibzseyo2oAIGIVeqZET0J2NJTOZmIpW\n\tPQ2398MzMRpLf2vU8ixCK7EMIYt992tfa3+XHTWEq8DDyKMaAW+RMv19","X-Gm-Gg":"AeBDieumd+Wl4vKmtSuBtOKPojjpkqtC8l5uFMrdaROlrERrYglOMKYerHZSxuD27Gy\n\tpiaxwW+7LUIwDE1vSE3cTEtH0RvX4eKdz0n5jnKCpikFusd4Dcub8ThMrwkOYibSIcpDguXZuWb\n\to9dgdqIfwfgWTGhx06Xxac9VIoxL6okjiNoS2JdP2hIyOIiiV6bmGTSBuOW3iTIOC28mGxGrB9S\n\t9DOa9iln4rJjX0HQOFMbIBD+YRimEb3idkYpTHgO02hMrsek0bA4WtLzhE5LVIB47tnyripuJCh\n\tGlbkMPI09/qc2IkVHXTGCGFH4s7wgja8H19D+l0px9r2SCsQviSyxY8DFpRD/UBHC/ifDbM2KFS\n\tp1XbAtESF90emQyuPBOl7j657X1qLhHuJyd0BRAJvMKw2LjLYm7MmBMmYgVtXoOCvroOy38Ox7J\n\twNxuM7V/tU5BHTSSZGHKDjj33pTb0NCcniGHkYiUnTq4KAZxPrZYSou75P08Bv0r5WoedYTJK6G\n\tc5YZv4XQy4p6eyEd84rwrVQmCL2sp8o8BvdzTY2aqSXHmrjaPw=","X-Received":"by 2002:a05:6000:401f:b0:43d:2be:e4e with SMTP id\n ffacd0b85a97d-43d292ff520mr6572751f8f.46.1775242426634;\n Fri, 03 Apr 2026 11:53:46 -0700 (PDT)","From":"Marino Dzalto ","To":"pablo@netfilter.org,\n\tfw@strlen.de","Cc":"netfilter-devel@vger.kernel.org,\n\tcoreteam@netfilter.org,\n\tnetdev@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org,\n\tMarino Dzalto ","Subject":"[PATCH] netfilter: xt_dscp: replace -EDOM with -EINVAL and unify\n 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":"netfilter-devel@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit"},"content":"From: Marino Dzalto \n\nSigned-off-by: Marino Dzalto \n---\n net/netfilter/xt_dscp.c | 18 +++++++-----------\n 1 file changed, 7 insertions(+), 11 deletions(-)","diff":"diff --git a/net/netfilter/xt_dscp.c b/net/netfilter/xt_dscp.c\nindex fb0169a8f..00137bff3 100644\n--- a/net/netfilter/xt_dscp.c\n+++ b/net/netfilter/xt_dscp.c\n@@ -25,16 +25,12 @@ static bool\n dscp_mt(const struct sk_buff *skb, struct xt_action_param *par)\n {\n \tconst struct xt_dscp_info *info = par->matchinfo;\n-\tu_int8_t dscp = ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT;\n+\tu8 dscp;\n \n-\treturn (dscp == info->dscp) ^ !!info->invert;\n-}\n-\n-static bool\n-dscp_mt6(const struct sk_buff *skb, struct xt_action_param *par)\n-{\n-\tconst struct xt_dscp_info *info = par->matchinfo;\n-\tu_int8_t dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT;\n+\tif (xt_family(par) == NFPROTO_IPV4)\n+\t\tdscp = ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT;\n+\telse\n+\t\tdscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT;\n \n \treturn (dscp == info->dscp) ^ !!info->invert;\n }\n@@ -44,7 +40,7 @@ static int dscp_mt_check(const struct xt_mtchk_param *par)\n \tconst struct xt_dscp_info *info = par->matchinfo;\n \n \tif (info->dscp > XT_DSCP_MAX)\n-\t\treturn -EDOM;\n+\t\treturn -EINVAL;\n \n \treturn 0;\n }\n@@ -74,7 +70,7 @@ static struct xt_match dscp_mt_reg[] __read_mostly = {\n \t\t.name\t\t= \"dscp\",\n \t\t.family\t\t= NFPROTO_IPV6,\n \t\t.checkentry\t= dscp_mt_check,\n-\t\t.match\t\t= dscp_mt6,\n+\t\t.match\t\t= dscp_mt,\n \t\t.matchsize\t= sizeof(struct xt_dscp_info),\n \t\t.me\t\t= THIS_MODULE,\n \t},\n","prefixes":[]}