{"id":2221783,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2221783/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260410112352.23599-8-fw@strlen.de/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/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,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260410112352.23599-8-fw@strlen.de>","list_archive_url":null,"date":"2026-04-10T11:23:48","name":"[net-next,07/11] netfilter: xt_socket: enable defrag after all other checks","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":true,"hash":"d9a5426c5feb9968df1e00da9795ceeed431b124","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/1.2/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260410112352.23599-8-fw@strlen.de/mbox/","series":[{"id":499444,"url":"http://patchwork.ozlabs.org/api/1.2/series/499444/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=499444","date":"2026-04-10T11:23:46","name":"[net-next,01/11] ipvs: show the current conn_tab size to users","version":1,"mbox":"http://patchwork.ozlabs.org/series/499444/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2221783/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2221783/checks/","tags":{},"related":[],"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:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-11803-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 sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::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 4fsZRD4Wm3z1yGS\n\tfor ; Fri, 10 Apr 2026 21:32:40 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 44D7C3098E67\n\tfor ; Fri, 10 Apr 2026 11:24:32 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 68E5F39EF0E;\n\tFri, 10 Apr 2026 11:24:30 +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 0314539DBF0;\n\tFri, 10 Apr 2026 11:24:28 +0000 (UTC)","by Chamillionaire.breakpoint.cc (Postfix, from userid 1003)\n\tid 91DE560490; Fri, 10 Apr 2026 13:24:26 +0200 (CEST)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775820270; cv=none;\n b=RSwwLXNC1rPfpCdJ0AnH9FuLiCbC07PNqn0KfcX7kcnVpNveKU1V3MefMucjeDBnqwajZi/WHN43n2HQ2BxcmHhW960ghKpFpSEdSuBWp34MHnFeYd0oDj8EPTpg2r8twKqL0aJj+Dp5fqCa2mAUxiCi9jVV0r06/K196WdmNJ0=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775820270; c=relaxed/simple;\n\tbh=I/5RC/jsOaOIeyIB2eGiXNKboXoXw0Issi0K3D6uM7I=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=MLGImlzuVlaiH6DlNSBDBHcC+kfjzwsbmyJXaubQdiRfDSQp1IKzBDZBz6ad8U7HthKcRQlppq9+SUbEdzRpgMm68dTIjBxoQ1+MRW/FtYUrgefxtT2jL955+/lq7UirRF+yz6pRkseKLevrtJDRlxVbh1Ibw4qUsfiSuFV8KUk=","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":"Paolo Abeni ,\n\t\"David S. Miller\" ,\n\tEric Dumazet ,\n\tJakub Kicinski ,\n\t,\n\tpablo@netfilter.org","Subject":"[PATCH net-next 07/11] netfilter: xt_socket: enable defrag after all\n other checks","Date":"Fri, 10 Apr 2026 13:23:48 +0200","Message-ID":"<20260410112352.23599-8-fw@strlen.de>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260410112352.23599-1-fw@strlen.de>","References":"<20260410112352.23599-1-fw@strlen.de>","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 defrag was enabled once per netns\nand only disabled again on netns dismantle. When this got changed I should\nhave adjusted checkentry to not leave defrag enabled on error.\n\nFixes: de8c12110a13 (\"netfilter: disable defrag once its no longer needed\")\nSigned-off-by: Florian Westphal \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":["net-next","07/11"]}