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 A8D4A43AAE; Mon, 4 Mar 2024 21:26:39 +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=1709587599; cv=none; b=leeyvKp2E0sBh2gAIYb3YLAbRpcidPXhpIoc060sj5dE7LTWGQHJOlXGU9zkCC+mM7YX3GDr2jL2QZuGtTiaRH+JhF98A9YtjbIEz5SeCg8bMvKQKNwKpYAlUP92bHMK6cwlTicrcSoT7eMrL2XqTh2/22Lq8UctTQazZYcGoO4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709587599; c=relaxed/simple; bh=SQ5umCoD4QmB/WrEq8aEEcUJt+LohkbdS8tI4wJB49Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IM1liOFCNgUDs5nhbxTurm+Kf2sr7VSVPYUtjqYzrvETDNcI2kQDdH7s07kaduYtXyU09PIO3QSKWMorW5BteQkQpDaM4X1arHzgzKaY71KpIjLVTfnKCr+of6/Io8ZqfpWcZriZ4Ni+VVP6x9+UlecMznoi1NPVuXJsAL07oIs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pRUoy4bG; 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="pRUoy4bG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39E7AC433F1; Mon, 4 Mar 2024 21:26:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709587599; bh=SQ5umCoD4QmB/WrEq8aEEcUJt+LohkbdS8tI4wJB49Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pRUoy4bGLZPZU/x8Gr7UEwhQqfiLVk5m5qESQUhpHhpnOmO957lcDJYshFhxOJFGN iXHSJ0aRhexG7RBAtoiA6weivyhhalvAqRs01ScmB4kYw2zjWlsUiJqp8S2qXoee1T iIaCWvU1+3DgA5dFf9t2wJVBWnl1IpZ5Ty3dQdEA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Christian Brauner , David Ahern , "David S. Miller" , Sasha Levin Subject: [PATCH 6.7 018/162] ipv6: fix potential "struct net" leak in inet6_rtm_getaddr() Date: Mon, 4 Mar 2024 21:21:23 +0000 Message-ID: <20240304211552.411233803@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240304211551.833500257@linuxfoundation.org> References: <20240304211551.833500257@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 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 10bfd453da64a057bcfd1a49fb6b271c48653cdb ] It seems that if userspace provides a correct IFA_TARGET_NETNSID value but no IFA_ADDRESS and IFA_LOCAL attributes, inet6_rtm_getaddr() returns -EINVAL with an elevated "struct net" refcount. Fixes: 6ecf4c37eb3e ("ipv6: enable IFA_TARGET_NETNSID for RTM_GETADDR") Signed-off-by: Eric Dumazet Cc: Christian Brauner Cc: David Ahern Reviewed-by: David Ahern Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv6/addrconf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 5a839c5fb1a5a..055230b669cf2 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5509,9 +5509,10 @@ static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr *nlh, } addr = extract_addr(tb[IFA_ADDRESS], tb[IFA_LOCAL], &peer); - if (!addr) - return -EINVAL; - + if (!addr) { + err = -EINVAL; + goto errout; + } ifm = nlmsg_data(nlh); if (ifm->ifa_index) dev = dev_get_by_index(tgt_net, ifm->ifa_index); -- 2.43.0