From patchwork Fri Oct 4 23:04:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Thompson X-Patchwork-Id: 832805 Received: from smtp-out1.aaront.org (smtp-out1.aaront.org [52.0.59.53]) (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 666521BF24; Fri, 4 Oct 2024 23:11:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.0.59.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728083480; cv=none; b=ctZYd+vKsgwE13vhH9opYP3TTYvE0TTH8kaDPnvdnTRiwW5xYAl14DWFP5WcZF7VZ5fq3Bf1YJUiTpM9bTDbM8QdSpjvcsJ5jC9e75ZF5gM3FWvHBmKnmYPxqu2zmKSOtTjVFhV6CrIE1yaqaeqHl1CaunadTKxs7l2k7DK13dU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728083480; c=relaxed/simple; bh=hSwY89Dc3i1dwP9dfCASLPDb2ZwIGzu1zOA5C3dVPm4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZvQPTX7RlwGS6YVg7zyNbBkJ8GroPkP4LLofhjwDfdImbf+2YOQ2krqf6Tq7I3yCFzcQHu8tPI1Cm0+0TFwOiDMhku+0mEDMMBkXRs1C7j64UFYV/KF2mT5ptgPBBVi4wWExMZHxkCuTJ7w54iErto0S3jFAilA7hCpBQ3RBF0o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aaront.org; spf=pass smtp.mailfrom=aaront.org; dkim=permerror (0-bit key) header.d=aaront.org header.i=@aaront.org header.b=G8iry+1e; dkim=pass (2048-bit key) header.d=aaront.org header.i=@aaront.org header.b=lLhMDNiy; arc=none smtp.client-ip=52.0.59.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aaront.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aaront.org Authentication-Results: smtp.subspace.kernel.org; dkim=permerror (0-bit key) header.d=aaront.org header.i=@aaront.org header.b="G8iry+1e"; dkim=pass (2048-bit key) header.d=aaront.org header.i=@aaront.org header.b="lLhMDNiy" Received: by smtp-out1.aaront.org (Postfix) with ESMTP id 4XL3z75BJKzhZ; Fri, 4 Oct 2024 23:04:51 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=aaront.org; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=habm2wya2ukbsdan; bh= hSwY89Dc3i1dwP9dfCASLPDb2ZwIGzu1zOA5C3dVPm4=; b=G8iry+1eo6z4ZKLh 2CVrFRgCTxyo+XqfkRLUP0Sb1/TuG5T8cruuA53pW2QGOGlUhsc+co9meBhrJsD8 jhbDAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aaront.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=qkjur4vrxk6kmqfk; bh= hSwY89Dc3i1dwP9dfCASLPDb2ZwIGzu1zOA5C3dVPm4=; b=lLhMDNiyf3hfZ8vN ibqw4bJR1qetgbjKj01AsGlYJT+KuvNHhKlzQthhTmdXBloUMzMjZ2ZNDeTTXBkE ldDNeMLrxIMvna8Tr1I7qNBvMwSFkmYqn00oe4h6RC0zEeCWwqouEiTLlfgqdVd9 Lw+7lKj4FxNuImUerSXmCaEDJq1hkHVD/HpyV6KWHQXucAywerVHVkL0GMiqtqvK 4xziVRfUK3Hvd3cjLRfSd1OgfMgwGTDLl0V4Tw+UE/4A33+aef87NO9hlqeGfyqD 4Mt6kogM/Xefjx8k+uytD+Prq7hoF3cbPuvSWpR8XeE6DeCmP3xQwcBIXTajJWGT 25bQKw== From: Aaron Thompson To: Johan Hedberg , Luiz Augusto von Dentz , Marcel Holtmann , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Aaron Thompson Subject: [PATCH v2 1/3] Bluetooth: ISO: Fix multiple init when debugfs is disabled Date: Fri, 4 Oct 2024 23:04:08 +0000 Message-Id: <20241004230410.299824-2-dev@aaront.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241004230410.299824-1-dev@aaront.org> References: <20241004230410.299824-1-dev@aaront.org> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Aaron Thompson If bt_debugfs is not created successfully, which happens if either CONFIG_DEBUG_FS or CONFIG_DEBUG_FS_ALLOW_ALL is unset, then iso_init() returns early and does not set iso_inited to true. This means that a subsequent call to iso_init() will result in duplicate calls to proto_register(), bt_sock_register(), etc. With CONFIG_LIST_HARDENED and CONFIG_BUG_ON_DATA_CORRUPTION enabled, the duplicate call to proto_register() triggers this BUG(): list_add double add: new=ffffffffc0b280d0, prev=ffffffffbab56250, next=ffffffffc0b280d0. ------------[ cut here ]------------ kernel BUG at lib/list_debug.c:35! Oops: invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 2 PID: 887 Comm: bluetoothd Not tainted 6.10.11-1-ao-desktop #1 RIP: 0010:__list_add_valid_or_report+0x9a/0xa0 ... __list_add_valid_or_report+0x9a/0xa0 proto_register+0x2b5/0x340 iso_init+0x23/0x150 [bluetooth] set_iso_socket_func+0x68/0x1b0 [bluetooth] kmem_cache_free+0x308/0x330 hci_sock_sendmsg+0x990/0x9e0 [bluetooth] __sock_sendmsg+0x7b/0x80 sock_write_iter+0x9a/0x110 do_iter_readv_writev+0x11d/0x220 vfs_writev+0x180/0x3e0 do_writev+0xca/0x100 ... This change removes the early return. The check for iso_debugfs being NULL was unnecessary, it is always NULL when iso_inited is false. Cc: stable@vger.kernel.org Fixes: ccf74f2390d6 ("Bluetooth: Add BTPROTO_ISO socket type") Signed-off-by: Aaron Thompson --- net/bluetooth/iso.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c index d5e00d0dd1a0..c9eefb43bf47 100644 --- a/net/bluetooth/iso.c +++ b/net/bluetooth/iso.c @@ -2301,13 +2301,9 @@ int iso_init(void) hci_register_cb(&iso_cb); - if (IS_ERR_OR_NULL(bt_debugfs)) - return 0; - - if (!iso_debugfs) { + if (!IS_ERR_OR_NULL(bt_debugfs)) iso_debugfs = debugfs_create_file("iso", 0444, bt_debugfs, NULL, &iso_debugfs_fops); - } iso_inited = true; From patchwork Fri Oct 4 23:04:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Thompson X-Patchwork-Id: 833084 Received: from smtp-out1.aaront.org (smtp-out1.aaront.org [52.0.59.53]) (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 5D34314BF8A; Fri, 4 Oct 2024 23:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.0.59.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728083097; cv=none; b=i2gkwGtOfM22k52fMczsHYrx8ARI40PckdT/KS1KKCuw+cwxz6dWLb9M4bk0qz/N/3XXA232DTfi3DK3rKmz0L5yDN/xaqvReRuKmeNkLavZ0yuQ7MJcjdeL0hPKcQnkgAUHSRWvnas5y4H7V7XgclpwZCtlTtj2icdks6oXYF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728083097; c=relaxed/simple; bh=gjC0Th+4DQx0Zl7m12gapSe4WeazmpHFL5sYGpiCjZk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GiR1tVbJlIqwg8rDlAS1t6pjjgUv0R4X0vMUVg/hZ91iQjk8hnZdb5tPaoRsZh5hodCAStJqXyuulWjX+Bv3X+O/tlGIyQMoeiU6pGFnAoyVLlRTmtzwcVmmPZiGU57QWJ80CDLWjFQc8FboSMSOdcClTp9souBpcMuHtpZoC/A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aaront.org; spf=pass smtp.mailfrom=aaront.org; dkim=permerror (0-bit key) header.d=aaront.org header.i=@aaront.org header.b=cAeDnDBp; dkim=pass (2048-bit key) header.d=aaront.org header.i=@aaront.org header.b=pV+KgAow; arc=none smtp.client-ip=52.0.59.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aaront.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aaront.org Authentication-Results: smtp.subspace.kernel.org; dkim=permerror (0-bit key) header.d=aaront.org header.i=@aaront.org header.b="cAeDnDBp"; dkim=pass (2048-bit key) header.d=aaront.org header.i=@aaront.org header.b="pV+KgAow" Received: by smtp-out1.aaront.org (Postfix) with ESMTP id 4XL3zB3lbjzhb; Fri, 4 Oct 2024 23:04:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=aaront.org; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=habm2wya2ukbsdan; bh= gjC0Th+4DQx0Zl7m12gapSe4WeazmpHFL5sYGpiCjZk=; b=cAeDnDBpMkfdvdJI yoDHF7j8Up7w/R6ugfnzyBzwmG+PsF677z4I1g3qauQNzPfKMS8FbkH9tWgLVDia ls5uDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aaront.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=qkjur4vrxk6kmqfk; bh= gjC0Th+4DQx0Zl7m12gapSe4WeazmpHFL5sYGpiCjZk=; b=pV+KgAowrzgf2CKI t6svpSLdxP7uXpmy89/xmyBg2tVG3zMxPq0N0NaeaFL81JIgrtuuJ3wqOdwfHOQ0 N70P97RbaVnGysIsP3tExLOtsSRwdIyvNLDabU8Sxo87Mmk+iwD050AO6kMANMfE YJLffECp75vww5ZmB74s0kPSfW1WhHIjKFK9KLtjYZu569GwjyFNFtrDVW1OsU6S I2aw9l7ayGx+7aulYj//ZqB6mO2erC3HfLh9/+9TSKSOIkhNwqEBH0qxyFjANgok SUBDXxJfgaa5kuN0bDRrxu8t54tqZYNU7YCn73WfV/n6yVVSRPj2cg00bSs+ZJ/w /wNjUQ== From: Aaron Thompson To: Johan Hedberg , Luiz Augusto von Dentz , Marcel Holtmann , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Aaron Thompson Subject: [PATCH v2 2/3] Bluetooth: Call iso_exit() on module unload Date: Fri, 4 Oct 2024 23:04:09 +0000 Message-Id: <20241004230410.299824-3-dev@aaront.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241004230410.299824-1-dev@aaront.org> References: <20241004230410.299824-1-dev@aaront.org> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Aaron Thompson If iso_init() has been called, iso_exit() must be called on module unload. Without that, the struct proto that iso_init() registered with proto_register() becomes invalid, which could cause unpredictable problems later. In my case, with CONFIG_LIST_HARDENED and CONFIG_BUG_ON_DATA_CORRUPTION enabled, loading the module again usually triggers this BUG(): list_add corruption. next->prev should be prev (ffffffffb5355fd0), but was 0000000000000068. (next=ffffffffc0a010d0). ------------[ cut here ]------------ kernel BUG at lib/list_debug.c:29! Oops: invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 1 PID: 4159 Comm: modprobe Not tainted 6.10.11-4+bt2-ao-desktop #1 RIP: 0010:__list_add_valid_or_report+0x61/0xa0 ... __list_add_valid_or_report+0x61/0xa0 proto_register+0x299/0x320 hci_sock_init+0x16/0xc0 [bluetooth] bt_init+0x68/0xd0 [bluetooth] __pfx_bt_init+0x10/0x10 [bluetooth] do_one_initcall+0x80/0x2f0 do_init_module+0x8b/0x230 __do_sys_init_module+0x15f/0x190 do_syscall_64+0x68/0x110 ... Cc: stable@vger.kernel.org Fixes: ccf74f2390d6 ("Bluetooth: Add BTPROTO_ISO socket type") Signed-off-by: Aaron Thompson --- net/bluetooth/af_bluetooth.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 67604ccec2f4..9425d0680844 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -830,6 +830,8 @@ static int __init bt_init(void) static void __exit bt_exit(void) { + iso_exit(); + mgmt_exit(); sco_exit(); From patchwork Fri Oct 4 23:04:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Thompson X-Patchwork-Id: 832806 Received: from smtp-out1.aaront.org (smtp-out1.aaront.org [52.0.59.53]) (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 C39D61514FB; Fri, 4 Oct 2024 23:04:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.0.59.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728083100; cv=none; b=SIw2KkdkEYP6jVJVX22jesl8knKQSeAyrJ66Op4whoINamjWkBuHC6sQfjvwgEC6kszNBJEmvc1rxymo+KsqyTCREBiy1BnPAVETB6USd/fWbBrUBZbOoR/iwBxHBUwyaF1Qtv41PyPQACtuPmY1o5zWSgifiGNeHXi+OZvFe7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728083100; c=relaxed/simple; bh=GXAjDisMoyLwQzUTKYzMVSa+TUKX6Km3nnqbIjEYk2M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rTbOXsDQa6PbtLkJLtNJdws3ncMpFOfQIsRj0HZY07+/VtnbFc+lr5QUaCzSFXY/X0ZI8UBxCe6E6xm0amrg6giEYMQa0iw3ZfQa2F+TYPCneMv0g+4T0l8VwBrl7QvxWEgez7580UfVUvtq1n7jzJLPMclHG+/w1XTDUgKaKv8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aaront.org; spf=pass smtp.mailfrom=aaront.org; dkim=permerror (0-bit key) header.d=aaront.org header.i=@aaront.org header.b=EmRgQN6s; dkim=pass (2048-bit key) header.d=aaront.org header.i=@aaront.org header.b=taiYZnGu; arc=none smtp.client-ip=52.0.59.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aaront.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aaront.org Authentication-Results: smtp.subspace.kernel.org; dkim=permerror (0-bit key) header.d=aaront.org header.i=@aaront.org header.b="EmRgQN6s"; dkim=pass (2048-bit key) header.d=aaront.org header.i=@aaront.org header.b="taiYZnGu" Received: by smtp-out1.aaront.org (Postfix) with ESMTP id 4XL3zG0mnYzhc; Fri, 4 Oct 2024 23:04:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=aaront.org; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=habm2wya2ukbsdan; bh= GXAjDisMoyLwQzUTKYzMVSa+TUKX6Km3nnqbIjEYk2M=; b=EmRgQN6sE1l6bqyi vFegWB+X8ymQlNaIRv8zLKBbw9mjI0hyv4xI9FsjAYMP6Nb0ZRCmfFUH5aFMvLI/ TIjUBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aaront.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=qkjur4vrxk6kmqfk; bh= GXAjDisMoyLwQzUTKYzMVSa+TUKX6Km3nnqbIjEYk2M=; b=taiYZnGugeAww4/X frnVl5z3HiwfLamfU3GfMVjZOu13ScBI4IFQwcqDxPhvnNilOsVZAQxUVo3/WcGU gR7VEofOdyJEBwI931+trFtjWWbmDEi/FeAQbLHJQ4Hed+Gzm7J0AVY+psVzYMVY T9QKaNhOplVuSiFNSk2eOh2f991USI05+6TQ8PD2ISr7RxoTqBjxtbiqiK8e/tGA XVwukyPbxNa4HO9rJ+5PC/Vti5Q1WFmQITylVUYzKzCcpAPW8jaYbpFNP4K6tS+N UNLutAhFT45/cbP06YLC5AN11yQKY2kNFG7kvI5HXMxII7V3u9CzdFtROSLnrC9b 4Eyrxw== From: Aaron Thompson To: Johan Hedberg , Luiz Augusto von Dentz , Marcel Holtmann , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Aaron Thompson Subject: [PATCH v2 3/3] Bluetooth: Remove debugfs directory on module init failure Date: Fri, 4 Oct 2024 23:04:10 +0000 Message-Id: <20241004230410.299824-4-dev@aaront.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241004230410.299824-1-dev@aaront.org> References: <20241004230410.299824-1-dev@aaront.org> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Aaron Thompson If bt_init() fails, the debugfs directory currently is not removed. If the module is loaded again after that, the debugfs directory is not set up properly due to the existing directory. # modprobe bluetooth # ls -laF /sys/kernel/debug/bluetooth total 0 drwxr-xr-x 2 root root 0 Sep 27 14:26 ./ drwx------ 31 root root 0 Sep 27 14:25 ../ -r--r--r-- 1 root root 0 Sep 27 14:26 l2cap -r--r--r-- 1 root root 0 Sep 27 14:26 sco # modprobe -r bluetooth # ls -laF /sys/kernel/debug/bluetooth ls: cannot access '/sys/kernel/debug/bluetooth': No such file or directory # # modprobe bluetooth modprobe: ERROR: could not insert 'bluetooth': Invalid argument # dmesg | tail -n 6 Bluetooth: Core ver 2.22 NET: Registered PF_BLUETOOTH protocol family Bluetooth: HCI device and connection manager initialized Bluetooth: HCI socket layer initialized Bluetooth: Faking l2cap_init() failure for testing NET: Unregistered PF_BLUETOOTH protocol family # ls -laF /sys/kernel/debug/bluetooth total 0 drwxr-xr-x 2 root root 0 Sep 27 14:31 ./ drwx------ 31 root root 0 Sep 27 14:26 ../ # # modprobe bluetooth # dmesg | tail -n 7 Bluetooth: Core ver 2.22 debugfs: Directory 'bluetooth' with parent '/' already present! NET: Registered PF_BLUETOOTH protocol family Bluetooth: HCI device and connection manager initialized Bluetooth: HCI socket layer initialized Bluetooth: L2CAP socket layer initialized Bluetooth: SCO socket layer initialized # ls -laF /sys/kernel/debug/bluetooth total 0 drwxr-xr-x 2 root root 0 Sep 27 14:31 ./ drwx------ 31 root root 0 Sep 27 14:26 ../ # Cc: stable@vger.kernel.org Fixes: ffcecac6a738 ("Bluetooth: Create root debugfs directory during module init") Signed-off-by: Aaron Thompson --- net/bluetooth/af_bluetooth.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 9425d0680844..e39fba5565c5 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -825,6 +825,7 @@ static int __init bt_init(void) bt_sysfs_cleanup(); cleanup_led: bt_leds_cleanup(); + debugfs_remove_recursive(bt_debugfs); return err; }