From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 9E2B13EB0F0 for ; Tue, 15 Sep 2026 09:13:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789463630; cv=none; b=SfHSMMW7927HVCMwmBsC/pXZIeWgJIhM4SgV6Pv3Y6zYRYBDo2UTHx+2sMzHg8xlZWIcjWc0QXBgX+oTr2YbZuz2jwn/DNkMePMuO87hFMX07rogmYIpzqqxHvp/dC2E4QtHFsbXxb9/uTbFDDuEohSJrB+c7M9hTurTRuhieOU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789463630; c=relaxed/simple; bh=Qj9TPK3mLqzLv4V48K3tEe+VRiKIEI6rimcodIOp2NU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BgA/5J64TAw9AJx7fZ505GnsJUGurGxQiuz87lJa7gLdaaB4XzjQkiGYXC5k8KVZ1KzNmZKG7GH/o3QKYvpwK9aa9aLYSF9LqM4w6Ntk/rUlYnqc6hcI1altP+s0h5sZ+dGmLm+tS6S2so6+Q0F2LTqYdOlMwM/U27ExMQq5dGY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=DBqSB5Nm; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=SnVfS2U0; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="DBqSB5Nm"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="SnVfS2U0" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68F8uqDR3111388 for ; Tue, 15 Sep 2026 09:13:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= cPK6TxwwqV0GZRDfZrEX+CmKiAJus2OaYwz7BZNVt/E=; b=DBqSB5NmQk9QeUrL tRbc0WYXZwVPSkXunpx/J2Wy7qdLYDxQrs5jo7dmCSztE6Q7jnx5/ebhqEQjmAmX DKxfLQ3laMNE8MzRRg1bCEm2mTe7P5bRHElOeKvYIp8iodVLjzpBsbjpaChzFKg4 QND93/bdIWXFawXyDa68os7MEVqhHMvYU3uX+xSGn7i0RQnMLz7LRgqRM7SPDQjL tgBu6Ue18JKKMEuX4Lijn+V6uRLHGBpH14z5u1XFmUV0TyAXf1RZzrtKB+kyftUO bmQSFq29CXGyclomz/GO/05lZMIdurqk4GenDxKKl+VXw2AltbNV0FHQ/4WO2T+B izT7xQ== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gq2y2g2qa-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 15 Sep 2026 09:13:46 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-39af306c795so1033644a91.3 for ; Tue, 15 Sep 2026 02:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1789463625; x=1790068425; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=cPK6TxwwqV0GZRDfZrEX+CmKiAJus2OaYwz7BZNVt/E=; b=SnVfS2U0H6bIhz4WSwm3+8qxGH+/fi8l3qOXr/gMo0orh9CssNcTKQ1VNwBY0RXZvn szSj/iDz2GwkNQ633vSdaCP3q1B0Rg0Jtw8L/X41KD+nAHYRIsMImnWT7k73EfI8GO2g XttnJlBZ0PfNqlJIAPZI9R/E74AvXLElvJBH1L1C3sZJ7wNpGrhUsilGxPfByTdJERfv Vw1FYtRq9ZyPzktXAzrezBjlK5J1XArhtzIsyS8kbNvjfllZfbAO6dYSgGzlKjauYGoU WbwAqyXvUSvTz2VfcoIWwJuhJDRwOPfdjJjR3R+O2E+a3opY2hHKMwWRwdVuvmsGJPur hckg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789463625; x=1790068425; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=cPK6TxwwqV0GZRDfZrEX+CmKiAJus2OaYwz7BZNVt/E=; b=MvblvsvQJuxcWSPih/YwR6d+sNTy4Vst36+3Ysh4r7hzS7ZkawCn4LS9NduvXyVZyp yxGk+Y3AJXL5YFNcWNo/J6Y5upjEBmKfAkc9BSw2UkH0rdB0WjewrPfxdhMr8Z2oswCY FFBIMsqe0bZYbBOqUlMFRwurMhW9+6hEVquYfrYG+oTp+rMJN9fm6paDYbASN2Io9zgS L2wk7YFoYhOLXG3yQRcGCRAt/zfbtqjTCYjsSAp+vsu+ClS1braQ7dKly+ikD3PD9Y13 PPTMPDykuoU3d6wX1ismceVvutKPasa/gpjP+9B+QHUrLJ6nITxotgN3nS2pbPyiDPoF VMmg== X-Gm-Message-State: AFuF++lt/iFj+bZ4lrqqWebATKEJ/Yo2YwUv0T1khpgF+ckQf60yJGHX qUndJR/p9DbJGKyzRLMyNErrMA2XIpuE9EDUPeVCEV4r7YIKCIsWfyCF+92GYYQsZCgJpG3HxS1 Z8huiRw+yH2oAClRfea2B4ENNcxF0BfsFoP+8jB4ebfW6mKMnN6+iBONF8b8SqWK8fURMKfI= X-Gm-Gg: AYBFou39CEpAKv/BcA3RZqfODcoPySEZsnKClITuN5SgQpkH6pZazwvGIF2jQd7VFFs y2BvA7PPXV3XR54FPS9Y7w3uvwQuk+yzuLYkMGcQ57IwXwdr0V+tvtB/VyeCuVLsGVkRAa2UnpN /5MD471PAhzyGaSBS550Rf1kt3oJNFYzHC5Rn0bW4DNrCQn7BHDlCmHq3MLKR+KvRKayLPihs8F omDutKasj3OGhqxKzgWIKMGCXr/r88q0e5E0zSiMIcnpKqUZNQXEQRGH9bhyrtrhMKXiHaEV0aA 8gwOD7apSyW/z4vToebHXfFmK510Buh59/L34H9XukqOpsMcc6bnfz3NZtLaVmckQhsINTkFXS1 g1cR3Djtc21L8xvYJFtS0UolRClQQpvqiLGKijkYtG/9/beY= X-Received: by 2002:a17:90b:2709:b0:39d:fcef:e241 with SMTP id 98e67ed59e1d1-39dfcefe940mr4913882a91.2.1789463625067; Tue, 15 Sep 2026 02:13:45 -0700 (PDT) X-Received: by 2002:a17:90b:2709:b0:39d:fcef:e241 with SMTP id 98e67ed59e1d1-39dfcefe940mr4913854a91.2.1789463624639; Tue, 15 Sep 2026 02:13:44 -0700 (PDT) Received: from hu-zijuhu-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-14390c0be29sm3493044c88.9.2026.09.15.02.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 02:13:44 -0700 (PDT) From: Zijun Hu Date: Tue, 15 Sep 2026 02:13:20 -0700 Subject: [PATCH BlueZ 1/2] monitor: Fix btmon heap-buffer-overflow triggered by HCI devcoredump Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260915-fix_heap_overflow-v1-1-8fc39dbcb303@oss.qualcomm.com> References: <20260915-fix_heap_overflow-v1-0-8fc39dbcb303@oss.qualcomm.com> In-Reply-To: <20260915-fix_heap_overflow-v1-0-8fc39dbcb303@oss.qualcomm.com> To: Marcel Holtmann , Luiz Augusto von Dentz Cc: Linux Bluetooth , linux-kernel@vger.kernel.org, Zijun Hu X-Mailer: b4 0.15.2 X-Proofpoint-ORIG-GUID: VL98XGebGbM6Bvfxa1YLqN7YH6lCeQf2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE1MDEzMSBTYWx0ZWRfXyuxWFVB6El9j O5+kC5EUNiFa6esV5SFJLlDaBdx25FbpwvP14/cDjSfxhh8oov8M+3NQbnC/z4X+Sg6stpcopMQ AwR/CxEZYDkr2sdm/sgNMEuMFJgcKyWUIY4jVA3SnpIvbffiKk7+o06Rd7z2rJ59q2lvvNtUi/A 47KLu/HymKbE31pXrIBQkEyfQ6ZECUMQyAFIXKm0siWsPCJPc9v1MOs6OVbZjPMQJH/yxbJO1rD dEHWPC10wv5Nvcf9CFqDyi9XkLsK59ePfTMqliBvPvRS5m8xgGBBBgjPvjTb4zogXkw9abEFwkS baKRWMk8b/hNB16ClKrkO9utGk58y2Nxq+cn2pYZekV0RA0UV08S6FTm+Gl7MUN7AYoaSstuWDO PvpWbq2s9Hj+hRcUyDHpQiZWvhR9uRirFRlz30dcM6CMekn3vphlnopeQUAjAtdy2xLGDd+8E/6 1PsYfEpPORTgIH170ow== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE1MDEzMSBTYWx0ZWRfX1C+ExSjnj4N4 hgfvatqj5slRZanYQcXXd7xieQlOrXwxiKJE/0UY4I8bU9dGB3Q6JrMKo2mIidq4dJvoOueXtYp Ir7/pruHI5rRo74BMQ/Vwek4heA0gBY= X-Proofpoint-GUID: VL98XGebGbM6Bvfxa1YLqN7YH6lCeQf2 X-Authority-Analysis: v=2.4 cv=IcISymqa c=1 sm=1 tr=0 ts=6aa90c4a cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=cGIbaRgtdj3G7wcnDWwA:9 a=QEXdDO2ut3YA:10 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-15_02,2026-09-14_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609150131 Kernel HCI devcoredump can accumulate a large amount of dump data from MANY packets, then send it as a SINGLE DIAG packet to the monitor channel, so cause payload length @len in the header exceed BTSNOOP_MAX_PACKET_SIZE, but btmon uses @len to access the payload in @buf without validating that @len fits within @buf, causing a heap-buffer-overflow. Kernel: include/net/bluetooth/hci_mon.h struct hci_mon_hdr { __le16 opcode; __le16 index; __le16 len; } __packed; BlueZ: src/shared/btsnoop.h #define BTSNOOP_MAX_PACKET_SIZE (1486 + 4) monitor/control.c struct control_data { uint16_t channel; int fd; unsigned char buf[BTSNOOP_MAX_PACKET_SIZE]; uint16_t offset; }; The heap-buffer-overflow Issue: ERROR: AddressSanitizer: heap-buffer-overflow on address 0x51b00000065c at pc 0x7f50b987a029 bp 0x7ffde88dc8d0 sp 0x7ffde88dc088 READ of size 17916 at 0x51b00000065c thread T0 #0 0x7f50b987a028 in write ../../../../src/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:1096 #1 0x5b4f3443ae3a in btsnoop_write ../src/shared/btsnoop.c:289 #2 0x5b4f3429cbf0 in data_callback ../monitor/control.c:969 #3 0x5b4f3444fa9d in mainloop_run ../src/shared/mainloop.c:104 #4 0x5b4f34451da6 in mainloop_run_with_signal ../src/shared/mainloop-notify.c:196 #5 0x5b4f342953fc in main ../monitor/main.c:303 #6 0x7f50b8c2a1c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58 #7 0x7f50b8c2a28a in __libc_start_main_impl ../csu/libc-start.c:360 #8 0x5b4f34295ed4 in _start (/usr/bin/btmon+0x29fed4) (BuildId: b41caafb24db693946c283eaea48112186863d2d) Fix by clamping @len to the amount of data received before accessing @buf. --- monitor/control.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/monitor/control.c b/monitor/control.c index 83347d5dbc3e..1eab9c4fe0bd 100644 --- a/monitor/control.c +++ b/monitor/control.c @@ -961,16 +961,19 @@ static void data_callback(int fd, uint32_t events, void *user_data) pktlen = le16_to_cpu(hdr.len); switch (data->channel) { case HCI_CHANNEL_CONTROL: packet_control(tv, cred, index, opcode, data->buf, pktlen); break; case HCI_CHANNEL_MONITOR: + if (pktlen > (len - MGMT_HDR_SIZE)) + pktlen = (len - MGMT_HDR_SIZE); + btsnoop_write_hci(btsnoop_file, tv, index, opcode, 0, data->buf, pktlen); ellisys_inject_hci(tv, index, opcode, data->buf, pktlen); packet_monitor(tv, cred, index, opcode, data->buf, pktlen); break; } -- 2.34.1