From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794409516; b=0VZKEkgYAPAKlkCfnWM8xKlC5/NMgtThVNpkQJvOAX6mZgAQ0hR4b3ENz4Sg6LA2Wpvt 9bUljnQQSQKrmiow+nd1TAv6swfuXx/B0FzGor8DSBZHtxtZO7mPgferHBnZb31TEBjl/ RZfpY7jq8tvfjyQ/aWNMI2S9CWxxJTd+Wg5anoijJHv8ngRUtg4wNn6l6zXJnmwgnyHfO sNk1JAi/rdA4y5VaoQ3DkJdFyNLVeUSlIl2+c05jh0IVnymam3qFVfkNnRFgxUIoh4gHN YSyhVCAREiqV8epAzr4FTXf74NnQOgvdGLi7SdG65fJ4i5B5eopo1u775kpM10njL0g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794409516; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=RboT5c/q3EdDmPo820n//UBSK2TPF1Wbdvkbvf/YKK0=; b=ltE+dZ7Le9ZAuDF/gAdmxbPO4k3xklwAE/7+wth7lksrDPjMjfW2KAwocp4izJY8//L5 OxRU1JODDaCjNNOOQ0NV7KhCYZeBfftlXT0GIKZQgpniIHk/lAveOtnjCviDEppyRGIN0 LdIOCgRLOcK9WsyEKven1Fc1tixX8VlnvXsEWw3SvhDw59OBwVZlykftv9U8rX8tdLa3c nwaWKHSpEHN7CnfSlICMbK3k4JMp9MjQ28XUYZANtU4qyP90ugb/2rWAweumyjO6pfItD JsU023Lt8NhEsHkDirha73qTTcHbB3bt9bsu+C4+dxSflhetsI2320z1PqnzDfNj/UQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=MdQud5GZ; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 69930606A33B for ; Wed, 11 Nov 2026 15:05:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=MdQud5GZ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97DFB1F00A05; Wed, 11 Nov 2026 15:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794409516; bh=RboT5c/q3EdDmPo820n//UBSK2TPF1Wbdvkbvf/YKK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MdQud5GZeLrBpWVomjSnipl/TLYn2O3m097/9e7/583mTl0O7RbzbYgS3ZsxIhBlK WKQg68XmTocv7NdIkj/Tk6nELxdQ5A7i4XteqK1gPA3IF9Te7X4gbDn4gWahFTTmZZ aPEdjYY1gzOMi8ID2Q0H5j1ZP2/5Z4dG49171yb9v2hxu3pnf3n4FW7EJkE/hPx9Jx H0EgjF4c5q2iDia+kJr+oFFa+b2F3bnJbwNFueZ1+/2hKvbDd9z11e/rIIOC7mIunN TLZutTAy2k+5r/u8S0sFmGPKg0Umcv0gALTDRT+jYjMZYOymBmawlIFeNW+IralkQT iaepZ7s8AridA== From: Sasha Levin To: stable@vger.kernel.org Cc: Runyu Xiao , Nicolas Dufresne , Hans Verkuil , Sasha Levin Subject: [PATCH 5.10.y] media: sti: delta: use unaligned accessors for MJPEG SOF fields Date: Wed, 11 Nov 2026 10:05:14 -0500 Message-ID: <20261111150457.2488898-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261107061823-failed-5.10-fdc5bf02aeae@kernel.org> References: <20261107061823-failed-5.10-fdc5bf02aeae@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Runyu Xiao [ Upstream commit fdc5bf02aeaef04e7d13895db9b6eaf8083953f9 ] delta_mjpeg_read_header() scans a compressed MJPEG access unit byte by byte and passes the bytes after an SOF marker to delta_mjpeg_read_sof(). The SOF parser then reads 16-bit big-endian fields directly from that byte stream. The SOF payload is not an aligned object. The marker scan can find the payload at any byte position, and the SOF layout also puts frame_height and frame_width after a one-byte sample_precision field. Those fields therefore sit at odd offsets within the payload even when the payload base happens to be 2-byte aligned. Avoid casting the byte stream to __be16 pointers and use get_unaligned_be16() for the SOF length, height, and width fields. This issue was detected by our static analysis tool and confirmed by manual audit. A focused UBSAN alignment validation of the same typed load shape reported a misaligned __be16 access in delta_mjpeg_read_sof(). Fixes: 433ff5b4a29b ("[media] st-delta: add mjpeg support") Cc: stable@vger.kernel.org Signed-off-by: Runyu Xiao Reviewed-by: Nicolas Dufresne Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil [ sashal: replaced the generic unaligned access header with the available architecture-specific header ] Signed-off-by: Sasha Levin --- drivers/media/platform/sti/delta/delta-mjpeg-hdr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/sti/delta/delta-mjpeg-hdr.c b/drivers/media/platform/sti/delta/delta-mjpeg-hdr.c index 90e5b2f72c82b..6e156cd806bb5 100644 --- a/drivers/media/platform/sti/delta/delta-mjpeg-hdr.c +++ b/drivers/media/platform/sti/delta/delta-mjpeg-hdr.c @@ -4,6 +4,7 @@ * Author: Hugues Fruchet for STMicroelectronics. */ +#include #include "delta.h" #include "delta-mjpeg.h" @@ -48,13 +49,13 @@ static int delta_mjpeg_read_sof(struct delta_ctx *pctx, goto err_no_more; memset(header, 0, sizeof(*header)); - header->length = be16_to_cpu(*(__be16 *)(data + offset)); + header->length = get_unaligned_be16(data + offset); offset += sizeof(u16); header->sample_precision = *(u8 *)(data + offset); offset += sizeof(u8); - header->frame_height = be16_to_cpu(*(__be16 *)(data + offset)); + header->frame_height = get_unaligned_be16(data + offset); offset += sizeof(u16); - header->frame_width = be16_to_cpu(*(__be16 *)(data + offset)); + header->frame_width = get_unaligned_be16(data + offset); offset += sizeof(u16); header->nb_of_components = *(u8 *)(data + offset); offset += sizeof(u8); -- 2.53.0