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 991FF13A26F; Tue, 27 Feb 2024 14:25:31 +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=1709043931; cv=none; b=lOzWfom/CXVHBOpo1Fa82ZwjYCICXg4cv1hAS7PvzYHzV0UX3ci/rr7IJ/G0RevJpTF2jIFvdLu2GAtGNi1ZFBQiKncXnjLJbS7qtNcUB5Ms9ioGl5I1ZCsGJD7IFLXldwNVUR7Xnpl7iHaCLUKdpkLrEoihPRwW46cki7yS5iA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709043931; c=relaxed/simple; bh=YruaM6U5IGiW+XX+KiXIGnRpsuiSoNOiq+4D6Ggad2c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FEgpXFn8OZf4/MXL9VdV72Z7cjDkOoUZsfJku7qAiNz3+W78FHdGat3Im24cYyGcHu/692aFsxr0D5MPXn7VZX4nooaDaMIfM+n3t06KDCd7pZbPFtWYm1j2V5I9GQs6e1PnStIGIcHtczcCmucCexSHU8WTdlpFZTtyApYZcIc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jX4rVrXw; 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="jX4rVrXw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E257C433C7; Tue, 27 Feb 2024 14:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709043931; bh=YruaM6U5IGiW+XX+KiXIGnRpsuiSoNOiq+4D6Ggad2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jX4rVrXwJz5J5XHk4RTSJ87ZzqPOC7RDJTbc0PYIMPRrOaAuR5qLqic8TeUen36xt lUSvaFlBq29AlvE2emFVxdGias3oqTw/Y1Odcwc/VgPndvJlJBJ2JVA7Ap6YxMjYLS rlY59gPl9N6MVcmlHakKAIY6VDPa1W1N5oFZd0Sc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vasiliy Kovalev , Paolo Abeni , Sasha Levin Subject: [PATCH 5.4 74/84] ipv6: sr: fix possible use-after-free and null-ptr-deref Date: Tue, 27 Feb 2024 14:27:41 +0100 Message-ID: <20240227131555.278696558@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131552.864701583@linuxfoundation.org> References: <20240227131552.864701583@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.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vasiliy Kovalev [ Upstream commit 5559cea2d5aa3018a5f00dd2aca3427ba09b386b ] The pernet operations structure for the subsystem must be registered before registering the generic netlink family. Fixes: 915d7e5e5930 ("ipv6: sr: add code base for control plane support of SR-IPv6") Signed-off-by: Vasiliy Kovalev Link: https://lore.kernel.org/r/20240215202717.29815-1-kovalev@altlinux.org Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/ipv6/seg6.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/net/ipv6/seg6.c b/net/ipv6/seg6.c index f5c448c276fef..7094f8691ac68 100644 --- a/net/ipv6/seg6.c +++ b/net/ipv6/seg6.c @@ -441,22 +441,24 @@ int __init seg6_init(void) { int err = -ENOMEM; - err = genl_register_family(&seg6_genl_family); + err = register_pernet_subsys(&ip6_segments_ops); if (err) goto out; - err = register_pernet_subsys(&ip6_segments_ops); + err = genl_register_family(&seg6_genl_family); if (err) - goto out_unregister_genl; + goto out_unregister_pernet; #ifdef CONFIG_IPV6_SEG6_LWTUNNEL err = seg6_iptunnel_init(); if (err) - goto out_unregister_pernet; + goto out_unregister_genl; err = seg6_local_init(); - if (err) - goto out_unregister_pernet; + if (err) { + seg6_iptunnel_exit(); + goto out_unregister_genl; + } #endif #ifdef CONFIG_IPV6_SEG6_HMAC @@ -477,11 +479,11 @@ int __init seg6_init(void) #endif #endif #ifdef CONFIG_IPV6_SEG6_LWTUNNEL -out_unregister_pernet: - unregister_pernet_subsys(&ip6_segments_ops); -#endif out_unregister_genl: genl_unregister_family(&seg6_genl_family); +#endif +out_unregister_pernet: + unregister_pernet_subsys(&ip6_segments_ops); goto out; } -- 2.43.0