From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E898B7DA7D; Thu, 15 Aug 2024 13:58:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723730307; cv=none; b=Ws+O9N3FYcLfpTPnx3HzSxJyeeuD8koUMHbGJxC8jzPtc9v9J0S1r5LMYcM/wBsVNXjpsFATJk5I1DUIiqHtyk1IKUZkcBdB7JkwqNSKgQFDHebmNhw/8E33AsqrSeddLiAijWbDPRIWC98l3ASpbGVulyfo94pRrHJPtzSsG8w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723730307; c=relaxed/simple; bh=3/W/BjpvRl7QhTa97yIsH222KmlLYmon3CbP85VDdWE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IMVHX+xwmrZIjDiHvi+Oybp7ac18onRUb4ARlgd6RlJ06gY+tvoo2XwV+Y3H3lTRZt+RoZ0ymGoALnKwOZWlebbt5EKI72ogrGnHzbmp92WFHI2LTAMcTkKz6sAMuBS9P8KPiAn9Wth09jwzUiBiKCeV809iMMyRGF0aHtlfwXU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PRbhmB/z; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PRbhmB/z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70FDCC32786; Thu, 15 Aug 2024 13:58:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723730306; bh=3/W/BjpvRl7QhTa97yIsH222KmlLYmon3CbP85VDdWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PRbhmB/zg5XjCRy1GuRY/s9fewvFCltNFaoKdOQopuDzKtqPV0rCmG70vrd4y+1Hu lwlpThVx8ED0qwg2lK5/+oNRGZkWeKPZAIrtZvGhXj0GnO4fEZLBxcmftEE32cEVQM pQJ0DVCtqb9p+wGovNv87iwtHxk/KzybFEdobA/g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kuniyuki Iwashima , Florian Westphal , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.15 337/484] netfilter: iptables: Fix potential null-ptr-deref in ip6table_nat_table_init(). Date: Thu, 15 Aug 2024 15:23:15 +0200 Message-ID: <20240815131954.430131747@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131941.255804951@linuxfoundation.org> References: <20240815131941.255804951@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kuniyuki Iwashima [ Upstream commit c22921df777de5606f1047b1345b8d22ef1c0b34 ] ip6table_nat_table_init() accesses net->gen->ptr[ip6table_nat_net_ops.id], but the function is exposed to user space before the entry is allocated via register_pernet_subsys(). Let's call register_pernet_subsys() before xt_register_template(). Fixes: fdacd57c79b7 ("netfilter: x_tables: never register tables by default") Signed-off-by: Kuniyuki Iwashima Reviewed-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/ipv6/netfilter/ip6table_nat.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/net/ipv6/netfilter/ip6table_nat.c b/net/ipv6/netfilter/ip6table_nat.c index 921c1723a01e4..229a81cf1a729 100644 --- a/net/ipv6/netfilter/ip6table_nat.c +++ b/net/ipv6/netfilter/ip6table_nat.c @@ -154,23 +154,27 @@ static struct pernet_operations ip6table_nat_net_ops = { static int __init ip6table_nat_init(void) { - int ret = xt_register_template(&nf_nat_ipv6_table, - ip6table_nat_table_init); + int ret; + /* net->gen->ptr[ip6table_nat_net_id] must be allocated + * before calling ip6t_nat_register_lookups(). + */ + ret = register_pernet_subsys(&ip6table_nat_net_ops); if (ret < 0) return ret; - ret = register_pernet_subsys(&ip6table_nat_net_ops); + ret = xt_register_template(&nf_nat_ipv6_table, + ip6table_nat_table_init); if (ret) - xt_unregister_template(&nf_nat_ipv6_table); + unregister_pernet_subsys(&ip6table_nat_net_ops); return ret; } static void __exit ip6table_nat_exit(void) { - unregister_pernet_subsys(&ip6table_nat_net_ops); xt_unregister_template(&nf_nat_ipv6_table); + unregister_pernet_subsys(&ip6table_nat_net_ops); } module_init(ip6table_nat_init); -- 2.43.0