From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 003C1366567 for ; Fri, 8 May 2026 05:50:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778219414; cv=none; b=gh/33vePxVuWdAl5+P+7gkjDDOyMTn6V/ZukP2JHuopD6VVOaDb4trWeE2Slo9e7nO4YBgxqM674W9mG5XLZs+GhC/P1xZyc8WsijVOipn2ESC4TOvwAZEQx442rrSg/a/H9WBjqhxZPu3wX+bRUQHQpYCwd6uohve819msmGik= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778219414; c=relaxed/simple; bh=ec6B7qykOTBiJ6NZK4JrYy6u4idk47JE8EiyQSWZnIs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eMrpPo7wq3cftfIi5u6MkpXWvlCtDhiap92CQIjtEjfJpsuwipifybcBPHdQaqFAtYtib+ECsRVU5mMfUnomNvByNlqAMUNZu5fF0Ml8fMRkUnS97YYj/8A1uYGKe8nU5TloifMV+0gleMaLY79IbifBKJvRZpqyyOj2rvN5jcI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Wn2HgxMu; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Wn2HgxMu" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-48a3e9862f0so10559865e9.1 for ; Thu, 07 May 2026 22:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778219403; x=1778824203; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vnicENqXkhZYZKmKK5sppI6Z3zXOzukFn10+6TxFlFM=; b=Wn2HgxMuKyJzMvB4PamijCn80bhmFCiZsuLuHLy4MZGa8X6r/4vLuwhEkSyxgeNLAk Yx87/24Oz1TNAlRw2PFycM8orUxWz0ViSOUR5X/Hdsdj2UYYfCUiOz/HwQc0OfDgCeFA GDc6Ru3nca2VSsYQA3oY9LGgoJ/DKKMgAraxucEHy9ObohHWfaiuCEvdQqsPFuvH7URc r5BE4KyQ7ZPey9EGddo3J8ol8536akZ5fEPXhSBI722EJD85nnLxi1vJ24qwUWyDTr9O qsjWN4/9mIKbLDeZTLAAFy4dOfYzBMJ3lJ2m7URq2OjQvFFQfbOMMF6wqcW4e8Azwyw2 p1kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778219403; x=1778824203; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vnicENqXkhZYZKmKK5sppI6Z3zXOzukFn10+6TxFlFM=; b=AZ2uWJYRygxJGeGFjZYaMRWNVFmRl5dEYDVp+awH7SFlDr5dLcO+Y+zfIqTkILBoin qxVPmIy/0e7QBCrGnvMLNkQd/emkBNbvYuNuVrvgsQqVI6PQyZmEfOHb31rowL1Z/VK5 +CSmehYmW0B9wA9yhBxXep0JK6pe2BCA+EqnnEurDO9dUvBF6huG8jhdnA2eQQ0lQts7 u0MAfUs8hMvvjf30hmqsRQaiFW9K9r//zI5C/vpGwkDOQpGdHaVHTxFNL0AHihlsnPPQ lSc+CYJ6qG7ZFmwOHVqbmJzgfaVM9dQDU3d11dTTemDsyutbz1QB7jMWLXaNf8nOFc6d P5NQ== X-Gm-Message-State: AOJu0Yxpa03aBB5vIb5HbR3HnYjuZ5RX5WpmgCa7eV3CsouYGm58WCqU 17KJv3opep3H/2wSgZyQRK4p1vZsNvqKD6uRuw0seSAHo0Bz+DXNHVY3 X-Gm-Gg: AeBDiev6hB7GVLFMh9SKIyrpRO/0SowqgjMdbpSIIQioU73/xd+gp7xBQgBlJackh/O GVf0l7EAgi7Hvum5FVi3tc/3aex5COAE2oA4cB/6DDK66A/CpzDRoed8RMNNSfNB/OOgsf9pyZw sBa/8iHY/saGm8htx+2mgEC4lDXDQz/SrdHPYjfNJ3LqA42hwnkwJwZGa0fYXzCx2xHykq38i4o rXdorRSJGFlKezhmjJqKSlqrzJdFf9AhfJj6klK3r1hhJSVQESmQseMz8OiLtkdVheH9lm6X+Qf AG2Fu5VeTOy/ukZy5d5tBbmZr/jF3YMcJ27i42EMnlfdWMgemNeYWW0Bx7SVTZuMIIlPdHtLBQi 7kHFTYQ7R5lxPx6149navCp7IMEFnfV8mBj1qjY1lsmehTUaAhNUK1Z3r8nhnV6lcYpW17bcYE4 X0Bxe6QnyALDY/1pHaNLXWH3sorfkuves4RvfYdTUnFXkFHiUxWTXfn/gv692ayqhLRkH9 X-Received: by 2002:a05:600c:3b8f:b0:48a:79d8:a8d6 with SMTP id 5b1f17b1804b1-48e642deefamr31155065e9.7.1778219402417; Thu, 07 May 2026 22:50:02 -0700 (PDT) Received: from mamamia.internal (a89-182-137-143.net-htp.de. [89.182.137.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e68eef558sm13414225e9.7.2026.05.07.22.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2026 22:50:02 -0700 (PDT) From: Andre Heider To: miquel.raynal@bootlin.com Cc: linux-kernel@vger.kernel.org, srini@kernel.org Subject: [PATCH v2] nvmem: layouts: onie-tlv: fix hang on unknown types Date: Fri, 8 May 2026 07:50:00 +0200 Message-ID: <20260508055000.24031-1-a.heider@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <87y0hvhys8.fsf@bootlin.com> References: <87y0hvhys8.fsf@bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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") Signed-off-by: Andre Heider Reviewed-by: Miquel Raynal --- Thanks for the quick review, Miquel! Added the Fixes: tag as requested, it dates back to the initial commit. Regards, Andre drivers/nvmem/layouts/onie-tlv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvmem/layouts/onie-tlv.c b/drivers/nvmem/layouts/onie-tlv.c index 0967a32319a28..8b0f3c1b8a0e9 100644 --- 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 device *dev, struct nvmem_device *nvmem, 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 device *dev, struct nvmem_device *nvmem, return ret; } +next: offset += sizeof(tlv) + tlv.len; } -- 2.53.0