From patchwork Fri Jan 5 23:20:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuxuan Luo X-Patchwork-Id: 1883156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T6KFW6CYbz1yPN for ; Sat, 6 Jan 2024 10:20:47 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rLtUY-0000xF-1b; Fri, 05 Jan 2024 23:20:42 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rLtUT-0000vW-9U for kernel-team@lists.ubuntu.com; Fri, 05 Jan 2024 23:20:37 +0000 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 01D333F18E for ; Fri, 5 Jan 2024 23:20:37 +0000 (UTC) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-4283ba32109so712531cf.3 for ; Fri, 05 Jan 2024 15:20:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704496835; x=1705101635; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O2Ex4qJovKOv9sItcEq8EtGTC9iNKcLP7CBMj1op1wo=; b=nnoOlwnY0bLJgXNRv/jLTTbeXX1r1YwV/4+KJB+EUMbxiTmFy7gZ/2WYG7r62vnX0R b/Yez3A5a8TZjc/USxuqh51R0586ksNZD1cLnP3KX/6LPXQlcQROECjfng7Iw8rn6i6u HyUWl9UFLxVwCvvGaVuOpK16eKnfSt2Iz/dntXm5Lfu/AqiML+USY3Pe5eKwgdBENz7K bOmdhBKMvlsldYBsUULdSKT0yOdPF+ow77bzruz42tAu8xxbsUpzhQsXmI2GlcoPBxMp aChoyfBqez1KYknx0N2j9oi1wfElIROWRiQ1WHIzYOgsOHrxUKQklOe0eLtvkaMitYRc oCEA== X-Gm-Message-State: AOJu0YxBQXCZlO7Fy8h5Z8vd18vxsu3+w+LNq8N2pXdeuKRL73ZdWM61 Qk+kPLXjGuLxOPJ6SQIfO89crNYVAsXdvE63kEybI37rUxphrAjzkCse4VVXwWQ8Rc8zLlJcMEj ZdTYIwxM0luR3DINhYWFMqG0eUThoKrfUYeULzuXpqUF5jKDPGOyTHvEa X-Received: by 2002:ac8:7d8a:0:b0:425:4043:1da3 with SMTP id c10-20020ac87d8a000000b0042540431da3mr185289qtd.118.1704496835217; Fri, 05 Jan 2024 15:20:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGrte0+1wLtrJkPGjSLtK8oXkeVF66QuvJUo5dEqVDDWeB63dw9sLnNifr2xYR8HJvF8jZBdQ== X-Received: by 2002:ac8:7d8a:0:b0:425:4043:1da3 with SMTP id c10-20020ac87d8a000000b0042540431da3mr185285qtd.118.1704496834938; Fri, 05 Jan 2024 15:20:34 -0800 (PST) Received: from cache-ubuntu.hsd1.nj.comcast.net ([2001:67c:1562:8007::aac:4795]) by smtp.gmail.com with ESMTPSA id b8-20020ac812c8000000b004281ccccdfcsm1141075qtj.51.2024.01.05.15.20.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 15:20:33 -0800 (PST) From: Yuxuan Luo To: kernel-team@lists.ubuntu.com Subject: [SRU][Lunar/Mantic][PATCH 1/1] Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg Date: Fri, 5 Jan 2024 18:20:30 -0500 Message-Id: <20240105232030.42941-3-yuxuan.luo@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240105232030.42941-1-yuxuan.luo@canonical.com> References: <20240105232030.42941-1-yuxuan.luo@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Hyunwoo Kim This can cause a race with bt_sock_ioctl() because bt_sock_recvmsg() gets the skb from sk->sk_receive_queue and then frees it without holding lock_sock. A use-after-free for a skb occurs with the following flow. ``` bt_sock_recvmsg() -> skb_recv_datagram() -> skb_free_datagram() bt_sock_ioctl() -> skb_peek() ``` Add lock_sock to bt_sock_recvmsg() to fix this issue. Cc: stable@vger.kernel.org Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Hyunwoo Kim Signed-off-by: Luiz Augusto von Dentz (cherry picked from commit 2e07e8348ea454615e268222ae3fc240421be768) CVE-2023-51779 Signed-off-by: Yuxuan Luo --- net/bluetooth/af_bluetooth.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 1c3c7ff5c3c66..f1b7510359e4b 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -264,11 +264,14 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, if (flags & MSG_OOB) return -EOPNOTSUPP; + lock_sock(sk); + skb = skb_recv_datagram(sk, flags, &err); if (!skb) { if (sk->sk_shutdown & RCV_SHUTDOWN) - return 0; + err = 0; + release_sock(sk); return err; } @@ -294,6 +297,8 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, skb_free_datagram(sk, skb); + release_sock(sk); + if (flags & MSG_TRUNC) copied = skblen;