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=1794063365; b=DoGimjcV1x4bEtJPN9icIsd+7IhQsiDNcBeBmI0I0D+RypwKDGNsivgaIvG37eUu4XIJ xPNLfYvjA/OAG3g4RTq6M4A85uSJ6yP1FnmkcKsfs/18vBMVEH0/MzILtYBmDgMFPV44J GHoXSOCCvTOLDfeLGM9zRNxjg33fXEWYHv9dfThk6mReoVE7BlBTbj7Ml2Ep6ecUnmXpX ovy13+UEkYyGRJHCn4hcjFheZyV0x3eUASYa6g62yyPeIPEeadWfxWDliu4OHixunzAC7 rLVH3O2zIEYJDqkxm9lBlXTxCZ/Jnr6cnGe3jj0jnEudSZTCBswL17nk7RZtk/XVLYg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063365; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=mVfxGfxN140fSIe9t0gB9mTFK38NGQENC2Pzvmxz88w=; b=fmXVciNUieynAyCV/qmDg4Thq8WoGrxYNZCVegiznYMEfrdkQGzvArdYBeK01dXSJFK2 3TCbn9dh8TaJpOsawGa4gqOCO0G58G/oQ8lMlLbdONKgrjy07LQxN4TnsDuShFKADJgMa 9IEUppCJYZ1tCYkzjZir92fZuCoPKY1c4YcLrrjiIkBfEwLkh8gMAqJHKGmInwTtfdWVm IF/HTB7D+kTlmyvfV5BdrWV9vbNF+rHZLcOxQgwOleeP2q6vaXGIwpIHNC1L8OXzXqHhb CR16QXeZL9b1WYPevxYGs7lgb5DbcfSf2QY/tMgkim+qkWoik41stY7GDy8EpPx8geg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=0C4m9nrB; 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 E7A01606A330; Sat, 7 Nov 2026 14:56:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=0C4m9nrB Received: by smtp.kernel.org (Postfix) with ESMTPSA id 957581F0089F; Sat, 7 Nov 2026 14:56:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063364; bh=mVfxGfxN140fSIe9t0gB9mTFK38NGQENC2Pzvmxz88w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0C4m9nrBzrAfntxhf61zooQN795HW/UexNK8/E7e47A6Rm95EIzjVFk51YRVGbI7s g28bZiHXUBOJH0eNYUO//CbPr6SIcrJc57AD1y3nT+DNWvXB8K9k4G3O9Drdm4WVM+ 56DBDYknv7WJ9Db+BaHIzU5TDm55lizuYb1QFdyI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Muhammad Bilal , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 6.18 542/869] platform/x86: hp-bioscfg: fix OOB reads in hp_get_string_from_buffer() Date: Sat, 7 Nov 2026 08:53:44 -0500 Message-ID: <20261107134911.790370861@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Muhammad Bilal [ Upstream commit 176b38b84ae5e075850b3ebb25f906d66f95a46d ] The escape prescan loop uses 'size' as both its bound and its accumulator, so each escape character found extends the loop and reads past the end of src[]. Use the original u16 count as the loop bound. Also include the 2-byte length prefix in the bounds check, pass the u16 count instead of the byte count to utf16s_to_utf8s(), and advance the buffer by the bytes actually consumed instead of the escape-inflated count. Tested on HP EliteBook 840 G2 (Fedora 44, Linux 7.2.7). Fixes: a34fc329b189 ("platform/x86: hp-bioscfg: bioscfg") Cc: stable@vger.kernel.org Signed-off-by: Muhammad Bilal Link: https://patch.msgid.link/20261007134711.473857-2-meatuni001@gmail.com Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 26 +++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c index f665af1c11850..288f7ac01dacc 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c @@ -54,8 +54,8 @@ int hp_get_integer_from_buffer(u8 **buffer, u32 *buffer_size, u32 *integer) int hp_get_string_from_buffer(u8 **buffer, u32 *buffer_size, char *dst, u32 dst_size) { u16 *src = (u16 *)*buffer; + u16 orig_size; u16 src_size; - u16 size; int i; int conv_dst_size; @@ -63,17 +63,21 @@ int hp_get_string_from_buffer(u8 **buffer, u32 *buffer_size, char *dst, u32 dst_ if (*buffer_size < sizeof(u16)) return -EINVAL; - src_size = *(src++); - /* size value in u16 chars */ - size = src_size / sizeof(u16); + src_size = *src; - /* Ensure there is enough space remaining to read and convert - * the string + /* + * Ensure there is enough space remaining for the length prefix + * just read plus the string data it describes. */ - if (*buffer_size < src_size) + if (*buffer_size < sizeof(u16) + src_size) return -EINVAL; - for (i = 0; i < size; i++) + src++; + /* size value in u16 chars */ + orig_size = src_size / sizeof(u16); + size = orig_size; + + for (i = 0; i < orig_size; i++) if (src[i] == '\\' || src[i] == '\r' || src[i] == '\n' || @@ -91,7 +95,7 @@ int hp_get_string_from_buffer(u8 **buffer, u32 *buffer_size, char *dst, u32 dst_ /* * convert from UTF-16 unicode to ASCII */ - utf16s_to_utf8s(src, src_size, UTF16_HOST_ENDIAN, dst, conv_dst_size); + utf16s_to_utf8s(src, orig_size, UTF16_HOST_ENDIAN, dst, conv_dst_size); dst[conv_dst_size] = 0; for (i = 0; i < conv_dst_size; i++) { @@ -117,8 +121,8 @@ int hp_get_string_from_buffer(u8 **buffer, u32 *buffer_size, char *dst, u32 dst_ src++; } - *buffer = (u8 *)src; - *buffer_size -= size * sizeof(u16); + *buffer += sizeof(u16) + src_size; + *buffer_size -= sizeof(u16) + src_size; return size; } -- 2.53.0