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 7BC0519F485; Tue, 27 Aug 2024 15:29:24 +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=1724772564; cv=none; b=jDFPH7pCzP0oSCX4592ROhnyJTxVw33mI2nWAbAGwJ2Sw/y0JQ5NJ2a3Mum3IDEvamFFtYN8CluHfWtEt0HMSLu6hqwYY1FDu1uWrhrsxdOwBotShVs7QeguXIhHPuZEwdGhm3/uAlg4WlUactbN2fzxMW/zPZ8tQFKXSY8x1XY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724772564; c=relaxed/simple; bh=qo85rHt/CzfTBx+iepjiUcF3cawH8syv/LkPBugROyU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h/9G3vOrQ8Srl3Pt4s0NrDx+PSWpU0yw7+UgwnpX/ArWJV1oGAfcBMO367cZvY36okVP7fpz48KBg7OdZMQIj3LyT0VKsSVW3SMbuXW7sasHUYThoQhWkOnGEUOb3Ex06krvAhHUWnQoGpQjEYGgLPX1DKzv1ueyjmGrjyLBDn0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vY4vpRKC; 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="vY4vpRKC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2436C6107E; Tue, 27 Aug 2024 15:29:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1724772564; bh=qo85rHt/CzfTBx+iepjiUcF3cawH8syv/LkPBugROyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vY4vpRKCgRMP6UQbmCRPzevFP/EiGz++n8MnGlgKZTIJyKjQlWj8R5JHZtI1GT35C moOuuA84H9fJfMfeLqiBzCdY6L/at/PJL7cqwQFMrkpvdCvD3X/3VYodX20HOzaeR9 O5956l2VfPXrolJ2LOCjLf8jPVnLfJkEosjyN+7o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Vasily Averin , David Ahern , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 253/321] ipv6: prevent possible UAF in ip6_xmit() Date: Tue, 27 Aug 2024 16:39:21 +0200 Message-ID: <20240827143847.874966246@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827143838.192435816@linuxfoundation.org> References: <20240827143838.192435816@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 2d5ff7e339d04622d8282661df36151906d0e1c7 ] If skb_expand_head() returns NULL, skb has been freed and the associated dst/idev could also have been freed. We must use rcu_read_lock() to prevent a possible UAF. Fixes: 0c9f227bee11 ("ipv6: use skb_expand_head in ip6_xmit") Signed-off-by: Eric Dumazet Cc: Vasily Averin Reviewed-by: David Ahern Link: https://patch.msgid.link/20240820160859.3786976-4-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv6/ip6_output.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index cfca9627398ee..f2227e662d1cf 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -278,11 +278,15 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, head_room += opt->opt_nflen + opt->opt_flen; if (unlikely(head_room > skb_headroom(skb))) { + /* Make sure idev stays alive */ + rcu_read_lock(); skb = skb_expand_head(skb, head_room); if (!skb) { IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); + rcu_read_unlock(); return -ENOBUFS; } + rcu_read_unlock(); } if (opt) { -- 2.43.0