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 701703C10A8 for ; Fri, 31 Jul 2026 11:33:31 +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=1785497612; cv=none; b=mjoN79mngvQcydumueSTurzRQsX3XvErNHnBUYN2+jUU3OgIXYbk9DPxn6VE3IjBMAygMzQe8tbBWRd2d4B0x6owIzHM8mh1G0fjYn4Ds6oDcnMwar/730hDW+w7qrOtmBcIoW77TnlHAU6NRR/QoCyJdwn+vBR/UtCjXXB6nec= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785497612; c=relaxed/simple; bh=FdPJfOwyme8zwBABiCrstAATwh+CpjfdIvbnsvEB950=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uBboCdvVhyxWo01jH67sq0OGi9lvg6zEvuecR7aKSzdclt1gxRfbmRYY8jhEJc38bkY4n1DKnd2KFPQ7jjr1s0qore6g3UqokerT2yIatBoeHir/JSfW6M3cLx43NTWBiqUAeumprOeWs9T2bYIz9viuHqFk7uYISDf49OhKUH4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E04YyQFJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="E04YyQFJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A00A91F00A3A; Fri, 31 Jul 2026 11:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785497611; bh=Bx10++uDb6PxmI4Fw3kZGmu6LxVNOlzsUbRuVO4RhA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=E04YyQFJX+fpaAmCd9KRC9fUkCaRRammKw4+Tu4notDx7USho5YyyLI9iSfj0FQAq 0QvkE5XS9R3soIRmL1YVi4N+rRioYjIRtHLpW1/zy2pAf2FN1wDJbApIGqZJaM0Rej RI3MpaYk+8YSgPQLgKq24ZRFUd5sBSwdPMr2ziUovK1Z1JRggFiZW2OcPNyK61UN3p 6R6bmZr+QbqgTm5JqhGmnYQifS2q+hfem+0kKmGZnk0tTIJQ6v/jOw/o9NfCevnhqi OoJZa9lxse67iUA3P8UL5AOuK0x30Z0v8y5TfYKU5xwFdawZIN9AQDPyNVegdYYRvj DLP8HEwtF8txA== From: Sasha Levin To: stable@vger.kernel.org Cc: Ashutosh Desai , Lyude Paul , Sasha Levin Subject: [PATCH 5.15.y] drm/dp/mst: fix OOB reads on 2-byte fields in sideband reply parsers Date: Fri, 31 Jul 2026 07:33:29 -0400 Message-ID: <20260731113329.3701390-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026072956-send-spouse-819c@gregkh> References: <2026072956-send-spouse-819c@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ashutosh Desai [ Upstream commit 6b89ba3dba2f583626fb693e47e951ffb8bf591f ] Three sideband reply parsers read 16-bit fields as: val = (raw->msg[idx] << 8) | (raw->msg[idx+1]); and check bounds only after the fact. When idx == raw->curlen, raw->msg[idx+1] reads one byte past the received message data into the following struct fields (curchunk_len, curchunk_idx, curlen). Affected functions: - drm_dp_sideband_parse_enum_path_resources_ack() full_payload_bw_number and avail_payload_bw_number fields - drm_dp_sideband_parse_allocate_payload_ack() allocated_pbn field - drm_dp_sideband_parse_query_payload_ack() allocated_pbn field Fix by using a single combined check (idx + 2 > curlen) before each 2-byte read. Since the check is strictly tighter than idx > curlen, no separate step is needed. Fixes: ad7f8a1f9ced ("drm/helper: add Displayport multi-stream helper (v0.6)") Cc: # v3.17+ Signed-off-by: Ashutosh Desai Reviewed-by: Lyude Paul [added fixes tag] Signed-off-by: Lyude Paul Link: https://patch.msgid.link/20260510203128.2884846-1-ashutoshdesai993@gmail.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_dp_mst_topology.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 70be5719e403..641a66ac2405 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -913,16 +913,13 @@ static bool drm_dp_sideband_parse_enum_path_resources_ack(struct drm_dp_sideband repmsg->u.path_resources.port_number = (raw->msg[idx] >> 4) & 0xf; repmsg->u.path_resources.fec_capable = raw->msg[idx] & 0x1; idx++; - if (idx > raw->curlen) + if (idx + 2 > raw->curlen) goto fail_len; repmsg->u.path_resources.full_payload_bw_number = (raw->msg[idx] << 8) | (raw->msg[idx+1]); idx += 2; - if (idx > raw->curlen) + if (idx + 2 > raw->curlen) goto fail_len; repmsg->u.path_resources.avail_payload_bw_number = (raw->msg[idx] << 8) | (raw->msg[idx+1]); - idx += 2; - if (idx > raw->curlen) - goto fail_len; return true; fail_len: DRM_DEBUG_KMS("enum resource parse length fail %d %d\n", idx, raw->curlen); @@ -940,12 +937,9 @@ static bool drm_dp_sideband_parse_allocate_payload_ack(struct drm_dp_sideband_ms goto fail_len; repmsg->u.allocate_payload.vcpi = raw->msg[idx]; idx++; - if (idx > raw->curlen) + if (idx + 2 > raw->curlen) goto fail_len; repmsg->u.allocate_payload.allocated_pbn = (raw->msg[idx] << 8) | (raw->msg[idx+1]); - idx += 2; - if (idx > raw->curlen) - goto fail_len; return true; fail_len: DRM_DEBUG_KMS("allocate payload parse length fail %d %d\n", idx, raw->curlen); @@ -959,12 +953,9 @@ static bool drm_dp_sideband_parse_query_payload_ack(struct drm_dp_sideband_msg_r repmsg->u.query_payload.port_number = (raw->msg[idx] >> 4) & 0xf; idx++; - if (idx > raw->curlen) + if (idx + 2 > raw->curlen) goto fail_len; repmsg->u.query_payload.allocated_pbn = (raw->msg[idx] << 8) | (raw->msg[idx + 1]); - idx += 2; - if (idx > raw->curlen) - goto fail_len; return true; fail_len: DRM_DEBUG_KMS("query payload parse length fail %d %d\n", idx, raw->curlen); -- 2.53.0