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 535F0451052; Tue, 16 Jun 2026 16:06:28 +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=1781625989; cv=none; b=MLTlhNJ8vds51biNA8f4wlWVSzWanT8kTfT8Vd+Qnqs5VqQ4s6s9E1xI9AiFpEEUriOX9IYgU+4C8QaZaBNnxAMobM3HAc0shjYsgAxVUamm/QbxobYiiKN1BwlZmVvjO2OoPz1S3uazdEldk+dDtz2AtA4P3NOoeVSQGv+bMp8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781625989; c=relaxed/simple; bh=m3auon5TbE8bt4Rs0koMYW22yXdIGPzfJaTibYDz4c0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KsyUQ4Ujng6rr4dSXWYFdM5htimGurT+OHpTBaGFN65QvyNdNyfUILOG61ukkhsRbSwyxpU0VvIYrtxEuv0mGg/OBrEDZ+UIzl5bZ+/ru0PbPQNvY7VGIqSRLPowyc6h5FWpJiM4dp8UpDwOi+Ktlfll7SfTmnIIxGiOhcb+pjw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=H9PefhGb; 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="H9PefhGb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 396221F000E9; Tue, 16 Jun 2026 16:06:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781625988; bh=kXy+dwxqS69GkZ+7Mm7zB7/u0dXkUnBf6glxKgQVH0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=H9PefhGbwAMTdQgqvzL38gwqEyvDDDc4hvNrv3MTKkglCeNfFUfM84IKHdumA+8Cp x4AWkAjyfK/BsBuVCznVSsB0DpPjDayzAe0TmP+zYqFgUJx2WIDGThuHJmEpjUD+s7 SSQuljbEMdf3xspnREe2tLwtadjTXMTy3xQPQm2I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stable@vger.kernel.org, Andre Heider , Miquel Raynal , Srinivas Kandagatla Subject: [PATCH 6.18 244/325] nvmem: layouts: onie-tlv: fix hang on unknown types Date: Tue, 16 Jun 2026 20:30:40 +0530 Message-ID: <20260616145110.636394206@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145057.827196531@linuxfoundation.org> References: <20260616145057.827196531@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andre Heider commit ea41020b9018e31c2ea7e9d89021e3e6d7470883 upstream. The EEPROM on my board has a vendor specific entry of type 0x41. When stumbling upon that, this driver hangs in an endless loop. Fix it by keep incrementing the offset on unknown entries, so the loop will eventually stop. Fixes: d3c0d12f6474 ("nvmem: layouts: onie-tlv: Add new layout driver") Cc: Stable@vger.kernel.org Signed-off-by: Andre Heider Reviewed-by: Miquel Raynal Signed-off-by: Srinivas Kandagatla Link: https://patch.msgid.link/20260530204340.116743-2-srini@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/nvmem/layouts/onie-tlv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/nvmem/layouts/onie-tlv.c +++ b/drivers/nvmem/layouts/onie-tlv.c @@ -119,7 +119,7 @@ static int onie_tlv_add_cells(struct dev cell.name = onie_tlv_cell_name(tlv.type); if (!cell.name) - continue; + goto next; cell.offset = hdr_len + offset + sizeof(tlv.type) + sizeof(tlv.len); cell.bytes = tlv.len; @@ -132,6 +132,7 @@ static int onie_tlv_add_cells(struct dev return ret; } +next: offset += sizeof(tlv) + tlv.len; }