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 9BF1633B6C4; Sat, 30 May 2026 17:29:52 +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=1780162193; cv=none; b=tnzOBhY+RAWJxv1o4uA0BXFxfvFsNfT6HxJcJSRNcs/a+aNn+RcCmzI3iCFi7Rr2hTPsDdGJgWohf1BnvEmiRpWGp+1C4RDlpS7CY569fMi0lj+KIkBU4CTD5MRe7IexZ0gS7O8+Aedm9YEPKqG5kCHwUQf9GFyyaVz616irJQg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780162193; c=relaxed/simple; bh=VeSY5S6iiHk41AxYRKmbl/MawpRGYbaTCc7b82VK2Oc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hsM0uB3qmzkxcu8ytIAqTX8ux2i7m47oRXuBwQiO4v/g+H2pwhIM7xgfnFN7o6IVl2EQdW2Py7nKiP//W2TfSEgtQmP6zVXhc1bNfcZVbKliXf4uZugBULxgBQvhi7RBoZBGrZaMCWuLbfE4j1ngznOLpraK5e0nsxkjqT2eao4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=L5WYfzd0; 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="L5WYfzd0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA2EC1F00893; Sat, 30 May 2026 17:29:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780162192; bh=77wG1moiTZcWYK08jb+kQMRKfvq5qYqERU2CPCB0qM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L5WYfzd0k2ALN1QvpR7Lpy0aNWv0+CqUhCQKOJb9Dg982wKEp92SR/rT5vNC0HO3d Asaty3Vqlq3s5vZrljYdsTV5WhwXK5vhAUs+GSGoK9B9P5tuGGW8sShPw3FaGbLbYD M2c/JdQ+kMYkDwzhA/y+ULioMxs0LZuBvnANeb60= 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.1 848/969] Bluetooth: MGMT: validate Add Extended Advertising Data length Date: Sat, 30 May 2026 18:06:12 +0200 Message-ID: <20260530160324.079749543@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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 @@ -9075,9 +9075,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);