Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Dragos-Marian Panait <dragos.panait@windriver.com>
To:     stable@vger.kernel.org
Cc:     Ruihan Li <lrh2000@pku.edu.cn>,
        Marcel Holtmann <marcel@holtmann.org>,
        Luiz Augusto von Dentz <luiz.von.dentz@intel.com>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        Paolo Abeni <pabeni@redhat.com>,
        "David S . Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>, netdev@vger.kernel.org,
        linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 6.1 1/1] bluetooth: Add cmd validity checks at the start of hci_sock_ioctl()
Date:   Tue, 30 May 2023 15:26:29 +0300
Message-Id: <20230530122629.231821-2-dragos.panait@windriver.com>
In-Reply-To: <20230530122629.231821-1-dragos.panait@windriver.com>
References: <20230530122629.231821-1-dragos.panait@windriver.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+/fZ4lIOx1iqdG7u6EHv3ybulX6pnrymp3s3pBurNvHNQW/RnlEywOWRxxh/?=
 =?us-ascii?Q?1bobApBtJqoNxxLTEQxUaZA9nInLCZfiCAKbVfBs4RtWLLUyjRoMKD+iuD0d?=
 =?us-ascii?Q?QFqVvjGrAVNwuZTGk/04st9aDQKrezSqarLs5lxFTHY8KGNAqIC3q6s2Pq1U?=
 =?us-ascii?Q?J0W4rNsSY7254VtE7byLtk54TkksU5uMeoI2zlkKlJSCoJSPqtX+/TIvNEJG?=
 =?us-ascii?Q?ZKL1LeCNQiaLLOaBc696jc2Qn5VPnjoZ6+LQc/e166bZYK6pqDd1pfwJ7FcD?=
 =?us-ascii?Q?q1ER8dUJU2bAgSIoo8KlzRjAI6fTw4GixhnPXIJhD04tmtL+4SgavmOPIst3?=
 =?us-ascii?Q?6CoErgdQ0BLCq1OQV7pEk7jTw664ksiMoFfqEYCQGKKllgKBix/sti2LyUBc?=
 =?us-ascii?Q?ePBxvkV8Q6i/geQ4zbvzxikvXaAJC5m4cz7h2dmg1UaA0Y/wLoDlLg68LkaQ?=
 =?us-ascii?Q?hHE4bVzKYd8FDyZp1v/R7nL0A5SdAv5BCU95AYVtKjLCG3OFgtY8fQMFti+T?=
 =?us-ascii?Q?3ejD8s1fKfB2f5VlUiGO0pYPuaifsm5OjG6nDOlEVrwbcMqaz5ywJVci1Mbr?=
 =?us-ascii?Q?OP9Y6Z72AMIRgfaJNLggvWRF0+joPrNbzvLj4DLf4V86MX6BpBDbY5icr6vr?=
 =?us-ascii?Q?dbiJqkc2KnvL+cIxnsg+1j+eDto7dtCHDBvpP+TkskWdzJkohT34LxvUhqZ4?=
 =?us-ascii?Q?ydeH142zwYv2bjnwjMtyPLZEUcIg7QZnst9d+4n1QXCY9TCESzbQGVYq8qOI?=
 =?us-ascii?Q?/fR86zzzW5Xy929e1YczmKfDCvLmlcHahMIOz8AdVl1JdlugaOUHYpatI0lz?=
 =?us-ascii?Q?d2aq1r189dZL94/aSquCkCt/W1oPg4Pgcl/i+FKu7jy/aewW6882sWTs6V1g?=
 =?us-ascii?Q?cQscE4FG51jljHQzbpSSQqUThFsL2+3REWxWp2QwMiOCjVCcc6fPMnClfKab?=
 =?us-ascii?Q?z2RdTnFbZiNCMYa4jKDz2YvZpitHCPRTh034YZ6WE8scxneXTYRwKCTx0DNA?=
 =?us-ascii?Q?ztAZPQKLfRBQacGAy4X5d9pCnO+s6C141/iie2fJX5qn7FLqPkZTZn7Srgwj?=
 =?us-ascii?Q?foX3spMCueUYoHNUdgT52rBlOL+/8ZeKhviO2EXpndgZTcxGMWItgJvcOdRU?=
 =?us-ascii?Q?3klBMdrBnlqzeOWWuAUDZIGEajBncAXUPfsEoAd8O3SeAgImASrrrzmSoerA?=
 =?us-ascii?Q?0G5Bzq3XmqoGz2EumgdzqI34AR4NPsYeLa+P/Dea/4DnA5RFUw1Mnpvcva4W?=
 =?us-ascii?Q?eYJcQ6CUMlsS9LgDHP4sLJjtMb1+XbPWQyRIV5IhJlIhQu4I/P0fAiMcEzNT?=
 =?us-ascii?Q?B4dtrQ5e2dhiuj1Jlej2W9vA25Avzg21PTqIOv2NTxl3KHCQn0x1v3Hl6n7F?=
 =?us-ascii?Q?SqZlMH/Js04sIJCnklgzODGm4PN77N4d0px8J69o6WHYMRzMJCSH5w6Hfoz8?=
 =?us-ascii?Q?HBWT2b/H+ltaNY+uT7mTf6UlB2MDT42C67B44o3PF0Wh9QdtJg+g52foZVHQ?=
 =?us-ascii?Q?kO2OZ1bimiAUJnDFFO66FnzErZIbZRh+oXXdfz5FJmLLSH+T3E0FQ7IGo2B+?=
 =?us-ascii?Q?kLvydrDAUuGPUNIdydAGo+NpnkH08U16UzyA3bfcolGWjsymjCFMUPsU2Zx+?=
 =?us-ascii?Q?EQ=3D=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e093f779-f432-4eed-0de5-08db610923b6
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB4952.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2023 12:26:48.7526
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: c90AuOsBCeCH+OK+tPr9iqGEMPssgQZ6iBinOTNO58cnKkXGrQgtzq06oxB/T3El8yfmzagaLExZQZToYa/OF3iDRzufTQyKWnToCdb1oAw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB7756
X-Proofpoint-GUID: K20rgS3qDoN3YtIwh8AwOKzFnBh5ek7b
X-Proofpoint-ORIG-GUID: K20rgS3qDoN3YtIwh8AwOKzFnBh5ek7b
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-05-30_08,2023-05-30_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0
 mlxlogscore=999 clxscore=1015 priorityscore=1501 spamscore=0
 lowpriorityscore=0 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305300103
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H3,
        RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

From: Ruihan Li <lrh2000@pku.edu.cn>

commit 000c2fa2c144c499c881a101819cf1936a1f7cf2 upstream.

Previously, channel open messages were always sent to monitors on the first
ioctl() call for unbound HCI sockets, even if the command and arguments
were completely invalid. This can leave an exploitable hole with the abuse
of invalid ioctl calls.

This commit hardens the ioctl processing logic by first checking if the
command is valid, and immediately returning with an ENOIOCTLCMD error code
if it is not. This ensures that ioctl calls with invalid commands are free
of side effects, and increases the difficulty of further exploitation by
forcing exploitation to find a way to pass a valid command first.

Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
Co-developed-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Dragos-Marian Panait <dragos.panait@windriver.com>
---
 net/bluetooth/hci_sock.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index f597fe0db9f8..1d249d839819 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -987,6 +987,34 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,
 
 	BT_DBG("cmd %x arg %lx", cmd, arg);
 
+	/* Make sure the cmd is valid before doing anything */
+	switch (cmd) {
+	case HCIGETDEVLIST:
+	case HCIGETDEVINFO:
+	case HCIGETCONNLIST:
+	case HCIDEVUP:
+	case HCIDEVDOWN:
+	case HCIDEVRESET:
+	case HCIDEVRESTAT:
+	case HCISETSCAN:
+	case HCISETAUTH:
+	case HCISETENCRYPT:
+	case HCISETPTYPE:
+	case HCISETLINKPOL:
+	case HCISETLINKMODE:
+	case HCISETACLMTU:
+	case HCISETSCOMTU:
+	case HCIINQUIRY:
+	case HCISETRAW:
+	case HCIGETCONNINFO:
+	case HCIGETAUTHINFO:
+	case HCIBLOCKADDR:
+	case HCIUNBLOCKADDR:
+		break;
+	default:
+		return -ENOIOCTLCMD;
+	}
+
 	lock_sock(sk);
 
 	if (hci_pi(sk)->channel != HCI_CHANNEL_RAW) {
-- 
2.40.1