{"id":2219775,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2219775/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260404101303.19577-1-fw@strlen.de/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.1/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":"<20260404101303.19577-1-fw@strlen.de>","date":"2026-04-04T10:12:59","name":"[nf-next] netfilter: xt_socket: enable defrag after all other checks","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d9a5426c5feb9968df1e00da9795ceeed431b124","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/1.1/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260404101303.19577-1-fw@strlen.de/mbox/","series":[{"id":498713,"url":"http://patchwork.ozlabs.org/api/1.1/series/498713/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=498713","date":"2026-04-04T10:12:59","name":"[nf-next] netfilter: xt_socket: enable defrag after all other checks","version":1,"mbox":"http://patchwork.ozlabs.org/series/498713/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2219775/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219775/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 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-11630-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=91.216.245.30","smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=strlen.de","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc"],"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 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fnryT541Sz1xtJ\n\tfor ; Sat, 04 Apr 2026 21:13:21 +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 543E03005994\n\tfor ; Sat, 4 Apr 2026 10:13:17 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id B12A53A9DA6;\n\tSat, 4 Apr 2026 10:13:14 +0000 (UTC)","from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc\n [91.216.245.30])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 284C92F6904\n\tfor ; Sat, 4 Apr 2026 10:13:13 +0000 (UTC)","by Chamillionaire.breakpoint.cc (Postfix, from userid 1003)\n\tid 3E1446079E; Sat, 04 Apr 2026 12:13:11 +0200 (CEST)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775297594; cv=none;\n b=JNwLAvZMeANbYmGuUsrGeb+qITLWEldRXszQfO6o/vnuNFiPSX+VcmpZ0yUynBEd130ZscsA7Ntb7erQlW7lv5F78KeWTc46gmUU45nKzL/kz/hfnWwuSCuCLi95UVaifLouiX5BMuuGI5CxyuNdNxwQTsL7Za9kEAxy1IQKKEA=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775297594; c=relaxed/simple;\n\tbh=ZrO5e1QVw9XDbYoZk9qRUVbp/U8W6JyaBDsAbkNnz/8=;\n\th=From:To:Cc:Subject:Date:Message-ID:MIME-Version;\n b=E7l0g/cEewYdsfTclGTLVm/KonUilmKuGOefv/hPGuq24LkpeQQWBTjuxIx8a+WtrrbA4eL/UbLR+Sk4YyqTiyl90LgJS+QedIQu93TOZJXO4JHF0ZRYYcJHuscPy0ixHKJfmncOFbbqNKGxqjXZJP8oJRs0CrecFv7W028zFow=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=strlen.de;\n spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc;\n arc=none smtp.client-ip=91.216.245.30","From":"Florian Westphal ","To":"","Cc":"Florian Westphal ","Subject":"[PATCH nf-next] netfilter: xt_socket: enable defrag after all other\n checks","Date":"Sat, 4 Apr 2026 12:12:59 +0200","Message-ID":"<20260404101303.19577-1-fw@strlen.de>","X-Mailer":"git-send-email 2.53.0","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":"Originally this did not matter because defag was enabled once per\nnamespace and only disabled again on netns dismantle. When this got\nchanged I should have adjusted checkentry to not leve defrag enabled on\nerror.\n\nFixes: de8c12110a13 (\"netfilter: disable defrag once its no longer needed\")\nSigned-off-by: Florian Westphal \n---\n Targetting nf-next because this isn't a regression per se.\n\n net/netfilter/xt_socket.c | 23 ++++++-----------------\n 1 file changed, 6 insertions(+), 17 deletions(-)","diff":"diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c\nindex 76e01f292aaf..811e53bee408 100644\n--- a/net/netfilter/xt_socket.c\n+++ b/net/netfilter/xt_socket.c\n@@ -168,52 +168,41 @@ static int socket_mt_enable_defrag(struct net *net, int family)\n static int socket_mt_v1_check(const struct xt_mtchk_param *par)\n {\n \tconst struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo;\n-\tint err;\n-\n-\terr = socket_mt_enable_defrag(par->net, par->family);\n-\tif (err)\n-\t\treturn err;\n \n \tif (info->flags & ~XT_SOCKET_FLAGS_V1) {\n \t\tpr_info_ratelimited(\"unknown flags 0x%x\\n\",\n \t\t\t\t info->flags & ~XT_SOCKET_FLAGS_V1);\n \t\treturn -EINVAL;\n \t}\n-\treturn 0;\n+\n+\treturn socket_mt_enable_defrag(par->net, par->family);\n }\n \n static int socket_mt_v2_check(const struct xt_mtchk_param *par)\n {\n \tconst struct xt_socket_mtinfo2 *info = (struct xt_socket_mtinfo2 *) par->matchinfo;\n-\tint err;\n-\n-\terr = socket_mt_enable_defrag(par->net, par->family);\n-\tif (err)\n-\t\treturn err;\n \n \tif (info->flags & ~XT_SOCKET_FLAGS_V2) {\n \t\tpr_info_ratelimited(\"unknown flags 0x%x\\n\",\n \t\t\t\t info->flags & ~XT_SOCKET_FLAGS_V2);\n \t\treturn -EINVAL;\n \t}\n-\treturn 0;\n+\n+\treturn socket_mt_enable_defrag(par->net, par->family);\n }\n \n static int socket_mt_v3_check(const struct xt_mtchk_param *par)\n {\n \tconst struct xt_socket_mtinfo3 *info =\n \t\t\t\t (struct xt_socket_mtinfo3 *)par->matchinfo;\n-\tint err;\n \n-\terr = socket_mt_enable_defrag(par->net, par->family);\n-\tif (err)\n-\t\treturn err;\n \tif (info->flags & ~XT_SOCKET_FLAGS_V3) {\n \t\tpr_info_ratelimited(\"unknown flags 0x%x\\n\",\n \t\t\t\t info->flags & ~XT_SOCKET_FLAGS_V3);\n \t\treturn -EINVAL;\n \t}\n-\treturn 0;\n+\n+\treturn socket_mt_enable_defrag(par->net, par->family);\n }\n \n static void socket_mt_destroy(const struct xt_mtdtor_param *par)\n","prefixes":["nf-next"]}