From nobody Sun Jun 21 13:59:44 2026 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 EE70C290DBB for ; Fri, 3 Apr 2026 20:03:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775246607; cv=none; b=oTGiY9IV2VDlx2BeG078w+TzNKfxddo2WKODTVSE9PDAotsDgbPDqoDyhDxuPvKG/rJxQo3YRU4ek4DERxlGELS81bfdlluggWoJ2c6kxS55GThgp6MIgugDcoH4OLzKzNtUH3ab+b8nJMIxibpVT6/nEhly4ddxWQ3/HUMa4rM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775246607; c=relaxed/simple; bh=wADCUDHqv3AIFQTlK0LzdVUglw2571qUMkTdVWFvIxQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=cBVpqFDEuaNeJodGM0YWPPt0xkE8tX/JyhfH7+TNOhSY1/3O0abqiKyapD9yD88AMj3o/dz7NkusiNnRc97pJDyOVAwR2HGVSPUQmjoFyVwZ6TLoReNtRUwSiEq4ksjxz2Zhvh1SqB0qSPT5mScN/j3uxFFp9IJcYR2bHqr9VOY= 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=aOiluptj; arc=none smtp.client-ip=209.85.128.54 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="aOiluptj" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-48897fd88ebso9743395e9.2 for ; Fri, 03 Apr 2026 13:03:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775246604; x=1775851404; 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=xE2VFOzNRG0wByucdsL3FPChPaVcDUKG/JIrmw8PamQ=; b=aOiluptjCA/ZuUk28yb+vu+KXgUVQcrEcTmITTmklUfzU7D9DiikISVepgca2lmm0l I3JfWMG1Zi+WkI8ZZAy/DXsuGo3s0TtfkgyVSS6390T/ZowHrHXx1CJMtDNwhy0e7sC0 ccnW1Hu0f7Ej2rzsH3QgiL0zWbVr/KTMgouHx808x9HytlV5KE1hUGzVeZ62k+DFG8a0 3ar+Krzt3UbkeyavIAhoTKjck4rZkYIHHtL/spA63/9JiKBSAVLv32lzF2NkxgllSF1K +D4/gWfyJdV+Rn204SI8X2JW6yiBORGV/r2XIW9UCRubhrYA0ilDag23CPFBmMhYMC6Y zAtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775246604; x=1775851404; 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=xE2VFOzNRG0wByucdsL3FPChPaVcDUKG/JIrmw8PamQ=; b=nvHxGF/a7Qb/Wg1ph7HN7IiKRd+USgzeMLY0erOy0PNgalPLBE3TketNRQMSSeaLBA pbtOPTGdmwM+PoOxk3iwlBW5PkYgW4zqps4M/khZxGuvxvJDWquRi5C05p53bw/lJLFo H791WOWOVKAXKxx2WTLfJAIiTHfE3TGCIAH5A1t36fZYcQFAKOorFPkl30htk5xNXQUj xVTWOeiaFKTxys5tY808T6pXlxIII7iYDZNeeFfJAUF1YNTbpkQRxTAAPcDi6XCWpzjT bVDsKZtmAmtlbPJVCdFYAwOpF44siA7wuhrPx9ZkipOogQsLja8uWXJhU3kgf0EwuD/A qSyg== X-Forwarded-Encrypted: i=1; AJvYcCWu9uP9Sy2aa1NYtK/2Ag+mCLcZsvoVRebxTRcEJPKrw1/vWRriHqWezNvkG0hbAb3jxg7SxxRWBcu37Mc=@vger.kernel.org X-Gm-Message-State: AOJu0YwpR0ytKkCSU55m9Oxi3KcSDYUaA0tTT5sNCAJtrIkI+nJU3lOK YhVLi+bHGYctlvt8YXtVvMAUZgEPe8FnepKbSARgdpP1+xQchK7qsFdp X-Gm-Gg: ATEYQzxtIQ2kD5XnwI4M+GhXTKz3kRFVLJ0suRO2hXl5GZ6XpMQH+qk3LFBvCc4PXea Vd8BdScpv40Hwr0sKn42qHIZHOPBuO+7XB2sJpanbAfpWcp4CySOthj67D9XVPdmyR58Wf7y1Ma o5rYYXRMRkYPyClUNQSxgNNBsoz1+PKunFPWK5lJCV35Dc5+GWY10HHX6fxhe4t9m9utMOyGu07 HUSsIFatlE0OSqf2qPc264Zp9skMBCc2CE+iiJNpx79rDsJhYiJrphjWjp9TJJqiygikt9AWBj8 +fGICPYFP5FpFvhsRWozbKGq0pdicR36fH4civAPIMChoxc35H4Fr4mTzy2Qz0tO7ccqd0hT3p4 7IH2eHpXHHSe1q68dDrxrc08g/c+OLkURWgDyIo5+n92veA4rCfpgkwaDfCCPG3EtPvjQf3sZm+ 94+amrn4emlRPygTRe8aNVwcXAYaTret6/EnU0eVBvINtA2fz2WXz97Bpv4iPzfKsRTpP4W5+qK s1bvSJl14VRS3ZViCQUMM6Lqs/LwLVcEg7FM5DMJEfcbN7uE8o= X-Received: by 2002:a05:600c:1d1d:b0:488:7ebd:78 with SMTP id 5b1f17b1804b1-4889977cbb7mr65937275e9.14.1775246604026; Fri, 03 Apr 2026 13:03:24 -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 5b1f17b1804b1-48895e19c10sm95627995e9.8.2026.04.03.13.03.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 Apr 2026 13:03:23 -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 v2] netfilter: xt_HL: add pr_fmt, drop NULL checks, add checkentry validation Date: Fri, 3 Apr 2026 22:03:20 +0200 Message-ID: <20260403200320.90449-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" Add pr_fmt for module-prefixed log messages. Remove unnecessary NULL checks for skb, as netfilter core guarantees skb is non-NULL. Add checkentry functions to validate match mode at rule registration time. Signed-off-by: Marino Dzalto --- net/netfilter/xt_hl.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/net/netfilter/xt_hl.c b/net/netfilter/xt_hl.c index c1a70f8f0..4a12a757e 100644 --- a/net/netfilter/xt_hl.c +++ b/net/netfilter/xt_hl.c @@ -6,6 +6,7 @@ * Hop Limit matching module * (C) 2001-2002 Maciej Soltysiak */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt =20 #include #include @@ -22,6 +23,18 @@ MODULE_LICENSE("GPL"); MODULE_ALIAS("ipt_ttl"); MODULE_ALIAS("ip6t_hl"); =20 +static int ttl_mt_check(const struct xt_mtchk_param *par) +{ + const struct ipt_ttl_info *info =3D par->matchinfo; + + if (info->mode > IPT_TTL_GT) { + pr_err("Unknown TTL match mode: %d\n", info->mode); + return -EINVAL; + } + + return 0; +} + static bool ttl_mt(const struct sk_buff *skb, struct xt_action_param *par) { const struct ipt_ttl_info *info =3D par->matchinfo; @@ -41,6 +54,18 @@ static bool ttl_mt(const struct sk_buff *skb, struct xt_= action_param *par) return false; } =20 +static int hl_mt6_check(const struct xt_mtchk_param *par) +{ + const struct ip6t_hl_info *info =3D par->matchinfo; + + if (info->mode > IP6T_HL_GT) { + pr_err("Unknown Hop Limit match mode: %d\n", info->mode); + return -EINVAL; + } + + return 0; +} + static bool hl_mt6(const struct sk_buff *skb, struct xt_action_param *par) { const struct ip6t_hl_info *info =3D par->matchinfo; @@ -65,6 +90,7 @@ static struct xt_match hl_mt_reg[] __read_mostly =3D { .name =3D "ttl", .revision =3D 0, .family =3D NFPROTO_IPV4, + .checkentry =3D ttl_mt_check, .match =3D ttl_mt, .matchsize =3D sizeof(struct ipt_ttl_info), .me =3D THIS_MODULE, @@ -73,6 +99,7 @@ static struct xt_match hl_mt_reg[] __read_mostly =3D { .name =3D "hl", .revision =3D 0, .family =3D NFPROTO_IPV6, + .checkentry =3D hl_mt6_check, .match =3D hl_mt6, .matchsize =3D sizeof(struct ip6t_hl_info), .me =3D THIS_MODULE, --=20 2.50.1 (Apple Git-155)