[PATCH] nvmem: layouts: onie-tlv: check both field header and value bounds
From: James Hilliard
Date: Tue Nov 17 2026 - 17:20:29 EST
The table CRC does not validate individual field lengths. The field
iterator can read a two-byte header when only one byte remains. Its
value length check also counts the header as available space and can
publish a cell extending beyond the table.
Check the remaining space before reading the header and exclude the
header from the space available for the value. Stop at the first
truncated field, keeping any complete cells already registered.
Fixes: d3c0d12f6474 ("nvmem: layouts: onie-tlv: Add new layout driver")
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/sashiko-outbox-219531@xxxxxxxxxx/
Signed-off-by: James Hilliard <james.hilliard1@xxxxxxxxx>
---
drivers/nvmem/layouts/onie-tlv.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/nvmem/layouts/onie-tlv.c b/drivers/nvmem/layouts/onie-tlv.c
index 4da3a704388e..1e397565b928 100644
--- a/drivers/nvmem/layouts/onie-tlv.c
+++ b/drivers/nvmem/layouts/onie-tlv.c
@@ -110,8 +110,15 @@ static int onie_tlv_add_cells(struct device *dev, struct nvmem_device *nvmem,
return -ENOENT;
while (offset < data_len) {
+ size_t remaining = data_len - offset;
+
+ if (remaining < sizeof(tlv)) {
+ dev_err(dev, "Truncated field header at 0x%x\n", hdr_len + offset);
+ break;
+ }
+
memcpy(&tlv, data + offset, sizeof(tlv));
- if (offset + tlv.len >= data_len) {
+ if (tlv.len > remaining - sizeof(tlv)) {
dev_err(dev, "Out of bounds field (0x%x bytes at 0x%x)\n",
tlv.len, hdr_len + offset);
break;
---
base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
base-tree: https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git for-fixes
change-id: 20261117-submit-nvmem-onie-tlv-bounds-v1-81e03449bcf6
Best regards,
--
James Hilliard <james.hilliard1@xxxxxxxxx>