From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 5061D282F17; Thu, 28 May 2026 20:16:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999412; cv=none; b=TTiH2fCNcac4m/88iK8+uMCA/5tuQQFwtNR0cRfRv9glMlOhIFCdKxWmzsk/zrRCwLW9E4g459MscJ4YA6yk+ArWzeFpazodFef2GikaPczLHkXr0pG3CCJxUqxGU9zSpvwgElr7LXWoxodoAmTa0L1t5Tp6WesNHmruR9ya/ow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999412; c=relaxed/simple; bh=ZYq7txBharBKSkaxDGjbEkompEyzYVk6DKoopprh2Bs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pIsFvVqv1ndCQ8ybvwQaVqrkAQWxM67+djMHsUxy5Z1vOyhHsqqPLYzG6HUDcOl+4SRge9qhPpJ0oy31B7uzAZ0PDb/8X6JT0xKQ+KC80HnNjr9nfVxtYnt5yrP28KXOP2nYDpJlSMjsQzc+h407TI820lkaL/oq7EbhBe0ntJM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lTffeq7/; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lTffeq7/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66EA91F000E9; Thu, 28 May 2026 20:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999410; bh=H1+ns9UV0uWWPco8sJI9st8WwS3yrfBqJAMZrrfhxcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lTffeq7/NFoiVfdURLY4g085SDeQKslhZLrSVIruNqWDdy4GDzGqtKJfr6PX4aSno dWYKTC3w4yoNg770KGtgkxkfnPVWBMV7H+wWCl+Cmad5YzXJMDycyiah5ja2shTQUg ybmdvRsbxfajhL9CurEGnOPJvwPJhNrcGU/95uP0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michael Bommarito , Luiz Augusto von Dentz Subject: [PATCH 6.18 057/377] Bluetooth: MGMT: validate Add Extended Advertising Data length Date: Thu, 28 May 2026 21:44:55 +0200 Message-ID: <20260528194640.020573761@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael Bommarito commit d3f7d17960ed50df3a6709c5158caff989c8c905 upstream. MGMT_OP_ADD_EXT_ADV_DATA is registered as a variable-length command, with MGMT_ADD_EXT_ADV_DATA_SIZE as the fixed header size. The handler then uses cp->adv_data_len and cp->scan_rsp_len to validate and copy cp->data, but it never checks that those bytes are part of the mgmt command payload. A short command can therefore make add_ext_adv_data() pass an out-of-bounds pointer into tlv_data_is_valid(). If the bytes beyond the command buffer are addressable, they can also be copied into the advertising instance as scan response data, where the caller can read them back via MGMT_OP_GET_ADV_INSTANCE. The trigger requires CAP_NET_ADMIN in the initial user namespace; KASAN reports an 8-byte slab-out-of-bounds read. Reject commands whose length does not match the fixed header plus both advertising data lengths before parsing cp->data. Fixes: 12410572833a ("Bluetooth: Break add adv into two mgmt commands") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Michael Bommarito Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Greg Kroah-Hartman --- net/bluetooth/mgmt.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -9094,9 +9094,15 @@ static int add_ext_adv_data(struct sock struct adv_info *adv_instance; int err = 0; struct mgmt_pending_cmd *cmd; + u16 expected_len; BT_DBG("%s", hdev->name); + expected_len = struct_size(cp, data, cp->adv_data_len + cp->scan_rsp_len); + if (expected_len != data_len) + return mgmt_cmd_status(sk, hdev->id, MGMT_OP_ADD_EXT_ADV_DATA, + MGMT_STATUS_INVALID_PARAMS); + hci_dev_lock(hdev); adv_instance = hci_find_adv_instance(hdev, cp->instance);