From patchwork Mon Oct 28 07:58:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koichiro Den X-Patchwork-Id: 2003146 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 4XcQlh0dMzz1xwF for ; Mon, 28 Oct 2024 18:59:44 +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 1t5Kf2-0005Nm-Rx; Mon, 28 Oct 2024 07:59:36 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t5Kf0-0005LO-W2 for kernel-team@lists.ubuntu.com; Mon, 28 Oct 2024 07:59:35 +0000 Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.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-0.canonical.com (Postfix) with ESMTPS id 8CAEE3F175 for ; Mon, 28 Oct 2024 07:59:34 +0000 (UTC) Received: by mail-oi1-f198.google.com with SMTP id 5614622812f47-3e601bc6ed0so2839610b6e.1 for ; Mon, 28 Oct 2024 00:59:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730102373; x=1730707173; 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=YhVc6FGJSZfQcDZtJXl67sKkGUc6WeCwiRimuvABdhA=; b=Yo0Ukb81abDwiQxJJ3JueR/Ogi2tj4Re37wgW1kZ4rrDn0hYPjYM7dRAOsAHAqQ4MX looXiJwTlz2VwnOccB7qG+SVlJVWuK86yC9yqMm6UNT+9M99P4iuPhLaUKhvnBQR+S8e CVB0l/HCksE8nkF9dlcYj+kQYpYrzV/yzJqsCZTXBhIWma1m3TNOoiMqQxmm9tL5OnCp PK6e5B0VCxwnWlsO+CubxBIUZdZcHzq18ZephRy90yAOnfU2PIVeODOLEYfxTaAAwtIi lvkZRMO1zCo9b9nNhuZnzsca2gQ3EMpi2WwzC3CNQy4k1ISzH4oK05hE6oXGe72KEAkO Rllw== X-Gm-Message-State: AOJu0Yy6TvLVwyG/hmZmYgnPnNNyymevurPC+OugXjopnN/MVOnpezi0 WuqA5efzfTHnJ8pAulDQTxzAhCWuw9wHdoTy1fRJ5kBadWAqjNpIViYz7yAgwsq+CuKAp81w6Sb 6YzH+7PjuOfvktpJl3OT9o29ErPKsgM7gMryE6w4P57I7BYhzUqSGGNOvuQNa02s5g5p3WdY3UU i8gWylxyq21g== X-Received: by 2002:a05:6808:1484:b0:3e4:d4ca:2774 with SMTP id 5614622812f47-3e6382571b3mr4504836b6e.20.1730102373241; Mon, 28 Oct 2024 00:59:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE7z/GHyCLRCtswa2iA/kUVTolTT22eIi2hCih2V/WxryP+7ImdoGIj+6bLoK0K1+p8s3K6nA== X-Received: by 2002:a05:6808:1484:b0:3e4:d4ca:2774 with SMTP id 5614622812f47-3e6382571b3mr4504829b6e.20.1730102372902; Mon, 28 Oct 2024 00:59:32 -0700 (PDT) Received: from localhost.localdomain ([240f:74:7be:1:fc2f:5f77:13cb:653f]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7edc89f595dsm5127262a12.59.2024.10.28.00.59.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 00:59:32 -0700 (PDT) From: Koichiro Den To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 1/5] Bluetooth: SCO: Fix not validating setsockopt user input Date: Mon, 28 Oct 2024 16:58:56 +0900 Message-ID: <20241028075902.114546-6-koichiro.den@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241028075902.114546-1-koichiro.den@canonical.com> References: <20241028075902.114546-1-koichiro.den@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: Luiz Augusto von Dentz [ Upstream commit 51eda36d33e43201e7a4fd35232e069b2c850b01 ] syzbot reported sco_sock_setsockopt() is copying data without checking user input length. BUG: KASAN: slab-out-of-bounds in copy_from_sockptr_offset include/linux/sockptr.h:49 [inline] BUG: KASAN: slab-out-of-bounds in copy_from_sockptr include/linux/sockptr.h:55 [inline] BUG: KASAN: slab-out-of-bounds in sco_sock_setsockopt+0xc0b/0xf90 net/bluetooth/sco.c:893 Read of size 4 at addr ffff88805f7b15a3 by task syz-executor.5/12578 Fixes: ad10b1a48754 ("Bluetooth: Add Bluetooth socket voice option") Fixes: b96e9c671b05 ("Bluetooth: Add BT_DEFER_SETUP option to sco socket") Fixes: 00398e1d5183 ("Bluetooth: Add support for BT_PKT_STATUS CMSG data for SCO connections") Fixes: f6873401a608 ("Bluetooth: Allow setting of codec for HFP offload use case") Reported-by: syzbot Signed-off-by: Eric Dumazet Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin (backported from commit b0e30c37695b614bee69187f86eaf250e36606ce linux-5.10.y) [koichiroden: Due to the absence of the entire patch series "get rid of the address_space override in setsockopt v2" (https://lore.kernel.org/all/20200723060908.50081-1-hch@lst.de/), newly introduced bt_copy_from_user replacing bt_copy_from_sockptr. Also dropped changed on BT_PKT_STATUS case, which does not exist in this tree due to missing commit: 00398e1d5183 ("Bluetooth: Add support for BT_PKT_STATUS CMSG data for SCO connections")] CVE-2024-35967 Signed-off-by: Koichiro Den --- include/net/bluetooth/bluetooth.h | 9 +++++++++ net/bluetooth/sco.c | 14 ++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 421d41ef4e9c..60b7d267e3f8 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -435,6 +435,15 @@ static inline struct sk_buff *bt_skb_sendmmsg(struct sock *sk, return skb; } +static inline int bt_copy_from_user(void *dst, size_t dst_size, + const void __user *src, size_t src_size) +{ + if (dst_size > src_size) + return -EINVAL; + + return copy_from_user(dst, src, dst_size); +} + int bt_to_errno(u16 code); void hci_sock_set_flag(struct sock *sk, int nr); diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 92e0712edf8d..78798284484f 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -817,7 +817,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen) { struct sock *sk = sock->sk; - int len, err = 0; + int err = 0; struct bt_voice voice; u32 opt; @@ -833,10 +833,9 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, break; } - if (get_user(opt, (u32 __user *) optval)) { - err = -EFAULT; + err = bt_copy_from_user(&opt, sizeof(opt), optval, optlen); + if (err) break; - } if (opt) set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags); @@ -853,11 +852,10 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, voice.setting = sco_pi(sk)->setting; - len = min_t(unsigned int, sizeof(voice), optlen); - if (copy_from_user((char *)&voice, optval, len)) { - err = -EFAULT; + err = bt_copy_from_user(&voice, sizeof(voice), optval, + optlen); + if (err) break; - } /* Explicitly check for these values */ if (voice.setting != BT_VOICE_TRANSPARENT &&