From nobody Thu Apr 2 15:35:53 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 AF0503F1679; Fri, 27 Mar 2026 13:16:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774617419; cv=none; b=ITJCNONw0F1R/h8fYJXUMrhGjeJR/hvGniCOznk/6XukXTQDpA8KkCvyWwlODQ0fvvL24tLnkZsFWEipreTDaI0AgYHAtZYVNHQPlS6SxiA6D49Sj28RpimUbykiKVmWNebjwB0yQtsmHa19sJKCA/mwIJG+q1oDySob3ORQnR8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774617419; c=relaxed/simple; bh=mP3+pIJqTHTO1gjsmh7erbRzVcxiFgunadHJlxC09Dw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bgdjlgw0hZMFOoTuiSD1BotIjCOO9yVg5hXxk9Y6Y8uOr/YuwRaQZmRtFFq72YASflwPmBugseZzsfnE1WAlrfFmFWrtmvgA2IabUmfh8AwcXqpti8w7t7vTbthU9LWbxk4h6QHm4poC678L0kUduXuizOsV8YNNKLgXvhS0jFM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rFjInnA4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rFjInnA4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E85DC2BCB0; Fri, 27 Mar 2026 13:16:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774617419; bh=mP3+pIJqTHTO1gjsmh7erbRzVcxiFgunadHJlxC09Dw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rFjInnA4W5eGEjTFg4XBCqFIexqhXf6KbfYLV4bIDxbzHHaZiMn8nbyR1NcGpf0WW 7ABoBXmu8aMjtS6VPsNufHXbc2/05GMr36oGFGzKRQurQQCJchdEncCw1+o4W+FEfA v047jhljZkhAcmPPRBFd4ORzGPjUC40ZXgjtH45BEZEqyl5dUg6UvkMHgePtgNdhOr 2vso+VibjMzXxCWcaVV78Tv8fs3e3NfXZ7JFZMk4AoeMMeVfMyhL014T0mAOuWxl/D kFwe4bXFhiyGLIUvlkHiQkknnoQuBXfZfqCsEL4odAabYu/BwpyTZ8zHAKQ440CSNZ NLJ/WSSGXNIhg== From: srini@kernel.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Christian Eggers , stable@vger.kernel.org, Fabio Estevam , Srinivas Kandagatla Subject: [PATCH 1/2] nvmem: imx: assign nvmem_cell_info::raw_len Date: Fri, 27 Mar 2026 13:16:44 +0000 Message-ID: <20260327131645.3025781-2-srini@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260327131645.3025781-1-srini@kernel.org> References: <20260327131645.3025781-1-srini@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Christian Eggers Avoid getting error messages at startup like the following on i.MX6ULL: nvmem imx-ocotp0: cell mac-addr raw len 6 unaligned to nvmem word size 4 nvmem imx-ocotp0: cell mac-addr raw len 6 unaligned to nvmem word size 4 This shouldn't cause any functional change as this alignment would otherwise be done in nvmem_cell_info_to_nvmem_cell_entry_nodup(). Cc: stable@vger.kernel.org Fixes: 13bcd440f2ff ("nvmem: core: verify cell's raw_len") Signed-off-by: Christian Eggers Signed-off-by: Fabio Estevam Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/imx-ocotp-ele.c | 1 + drivers/nvmem/imx-ocotp.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/nvmem/imx-ocotp-ele.c b/drivers/nvmem/imx-ocotp-ele.c index 7cf7e809a8f5..a0d2985c6d03 100644 --- a/drivers/nvmem/imx-ocotp-ele.c +++ b/drivers/nvmem/imx-ocotp-ele.c @@ -131,6 +131,7 @@ static int imx_ocotp_cell_pp(void *context, const char = *id, int index, static void imx_ocotp_fixup_dt_cell_info(struct nvmem_device *nvmem, struct nvmem_cell_info *cell) { + cell->raw_len =3D round_up(cell->bytes, 4); cell->read_post_process =3D imx_ocotp_cell_pp; } =20 diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c index 7bf7656d4f96..108d78d7f6cb 100644 --- a/drivers/nvmem/imx-ocotp.c +++ b/drivers/nvmem/imx-ocotp.c @@ -589,6 +589,7 @@ MODULE_DEVICE_TABLE(of, imx_ocotp_dt_ids); static void imx_ocotp_fixup_dt_cell_info(struct nvmem_device *nvmem, struct nvmem_cell_info *cell) { + cell->raw_len =3D round_up(cell->bytes, 4); cell->read_post_process =3D imx_ocotp_cell_pp; } =20 --=20 2.47.3 From nobody Thu Apr 2 15:35:53 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 99BFE3F54A2; Fri, 27 Mar 2026 13:17:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774617421; cv=none; b=a9FoLFtxWdTuHhEFC6C3BTCZApOOgqH59K5vZmbsZElSEqOLQfoKKsEycXS6mmMS/YfMG+sfxcWrzyNmhbFO5sTeroYvNppe2iywKqq5QAgXNBEsKALm2kSkkHszAl97XglTcecfozJoVERo5T/88wCmyatPQeHuy8h/0H971qc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774617421; c=relaxed/simple; bh=l2Wb0oVTIQsMM3NmSvpjN/9r9uGPXLRKEcydauBmvWo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=li6GBWi/92ClzLQu55Z14wPcITBw2ICx1ExgMBOGoRu1jI9EyxCBVhJkg01/vCQmOoZCZNWUEyaahj2hsoct/efuJHRWkK3zmY/CT7l6K7Uem9DaZq8s3a+LAgyE/aj0TJEhG/c1RnPGRJyHXSTrBOmGCcBwQQyNU5yjtjDiyFk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hdS6VlxT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hdS6VlxT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1BCFC2BC9E; Fri, 27 Mar 2026 13:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774617421; bh=l2Wb0oVTIQsMM3NmSvpjN/9r9uGPXLRKEcydauBmvWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hdS6VlxTCrypQUM5yZNL5J3p6W/DNiFD1Q3qeJkMuspiCucvTNSIPEcGGCGwjaNip n8kfuoMeY+W8zlsVmK8xz0TDAVsKN2uWWMI2UkwCGRKy+wNloW0QCsjRvhmygVFelX W9HqoErP9v4uHTQun3EXJORKqkKHfy+/Jx5DIw1fNlnKwOCLIefBxfrndVEDRpmbRX sJCOhWUpdBfmYN23KVStDMKphvsxU6loJHTXaQsuCQ0aKh82REhKcmSLUrt9VhVVFE UNIoEcpjirEg6dBC3pktXYDjgOyMM0SF64yFVe5qgZ28SLpj+nuNU1qqzR3tWX/XHf bkXfaBBqhYVZw== From: srini@kernel.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Ivan Vera , stable@vger.kernel.org, Harish Ediga , Harsh Jain , Srinivas Kandagatla Subject: [PATCH 2/2] nvmem: zynqmp_nvmem: Fix buffer size in DMA and memcpy Date: Fri, 27 Mar 2026 13:16:45 +0000 Message-ID: <20260327131645.3025781-3-srini@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260327131645.3025781-1-srini@kernel.org> References: <20260327131645.3025781-1-srini@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ivan Vera Buffer size used in dma allocation and memcpy is wrong. It can lead to undersized DMA buffer access and possible memory corruption. use correct buffer size in dma_alloc_coherent and memcpy. Fixes: 737c0c8d07b5 ("nvmem: zynqmp_nvmem: Add support to access efuse") Cc: stable@vger.kernel.org Signed-off-by: Ivan Vera Signed-off-by: Harish Ediga Signed-off-by: Harsh Jain Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/zynqmp_nvmem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/nvmem/zynqmp_nvmem.c b/drivers/nvmem/zynqmp_nvmem.c index 7da717d6c7fa..d297ff150dc0 100644 --- a/drivers/nvmem/zynqmp_nvmem.c +++ b/drivers/nvmem/zynqmp_nvmem.c @@ -66,7 +66,7 @@ static int zynqmp_efuse_access(void *context, unsigned in= t offset, dma_addr_t dma_buf; size_t words =3D bytes / WORD_INBYTES; int ret; - int value; + unsigned int value; char *data; =20 if (bytes % WORD_INBYTES !=3D 0) { @@ -80,7 +80,7 @@ static int zynqmp_efuse_access(void *context, unsigned in= t offset, } =20 if (pufflag =3D=3D 1 && flag =3D=3D EFUSE_WRITE) { - memcpy(&value, val, bytes); + memcpy(&value, val, sizeof(value)); if ((offset =3D=3D EFUSE_PUF_START_OFFSET || offset =3D=3D EFUSE_PUF_MID_OFFSET) && value & P_USER_0_64_UPPER_MASK) { @@ -100,7 +100,7 @@ static int zynqmp_efuse_access(void *context, unsigned = int offset, if (!efuse) return -ENOMEM; =20 - data =3D dma_alloc_coherent(dev, sizeof(bytes), + data =3D dma_alloc_coherent(dev, bytes, &dma_buf, GFP_KERNEL); if (!data) { ret =3D -ENOMEM; @@ -134,7 +134,7 @@ static int zynqmp_efuse_access(void *context, unsigned = int offset, if (flag =3D=3D EFUSE_READ) memcpy(val, data, bytes); efuse_access_err: - dma_free_coherent(dev, sizeof(bytes), + dma_free_coherent(dev, bytes, data, dma_buf); efuse_data_fail: dma_free_coherent(dev, sizeof(struct xilinx_efuse), --=20 2.47.3