From nobody Sun Feb 8 13:27:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27C2AC7EE25 for ; Fri, 9 Jun 2023 11:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230058AbjFILd7 (ORCPT ); Fri, 9 Jun 2023 07:33:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229903AbjFILd5 (ORCPT ); Fri, 9 Jun 2023 07:33:57 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71D3D273A for ; Fri, 9 Jun 2023 04:33:55 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 7367A5FD8E; Fri, 9 Jun 2023 14:33:53 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1686310433; bh=qmsUUrKjh9rocfbKKmAgXks3LyDsbEzfMxmSKs8SSec=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=JNN0kYD2b7pB8HqD25tK7WRIPj/k8oy9ySUby84vB48sjGXvi9TWgh1aCNnKF+ssu rsYL78qY0DHIu4k4YgLErkoIIel47jiEb4KAlbRJwVeJY5E9cA57IieG/mPk1/y2BG 5NL+Hr6eAOETPD5fhPQ9yDTZ58i3YQOGjzi2DpsQdFinres3zw8D+AP/U3vJzSUcda s66NowvQ5XsrRTV01DRJZS2v10EVtZaRW6pIlfdoiCi3TlrN3Wh9ALyW39LVyGt6wX 2Dnas4zsFSxGGlxucpXPVxKdZwWIc8hnmrobvO6XBWZIjrEpqyLHjQ1713aF1QukE3 hmpSGisy4vI2A== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Fri, 9 Jun 2023 14:33:52 +0300 (MSK) From: Arseniy Krasnov To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl CC: , , Arseniy Krasnov , , , , Subject: [PATCH v3] mtd: rawnand: meson: check buffer length Date: Fri, 9 Jun 2023 14:28:39 +0300 Message-ID: <20230609112840.2325455-1-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/06/09 07:08:00 #21465535 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Meson NAND controller has limited buffer length, so check it before command execution to avoid length trim. Also check MTD write size on chip attach. Signed-off-by: Arseniy Krasnov --- Changelog: v1 -> v2: * Move checks from 'switch/case' which executes commands in 'meson_nfc_exe= c_op()' to a special separated function 'meson_nfc_check_op()' which is called b= efore commands processing. v2 -> v3: * Check value returned from 'meson_nfc_check_op()' in separated 'if()', e.= g. without ORing it with 'check_only'. drivers/mtd/nand/raw/meson_nand.c | 46 +++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson= _nand.c index 074e14225c06..5c034988cd13 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -108,6 +108,8 @@ =20 #define PER_INFO_BYTE 8 =20 +#define NFC_CMD_RAW_LEN GENMASK(13, 0) + struct meson_nfc_nand_chip { struct list_head node; struct nand_chip nand; @@ -280,7 +282,7 @@ static void meson_nfc_cmd_access(struct nand_chip *nand= , int raw, bool dir, =20 if (raw) { len =3D mtd->writesize + mtd->oobsize; - cmd =3D (len & GENMASK(13, 0)) | scrambler | DMA_DIR(dir); + cmd =3D len | scrambler | DMA_DIR(dir); writel(cmd, nfc->reg_base + NFC_REG_CMD); return; } @@ -544,7 +546,7 @@ static int meson_nfc_read_buf(struct nand_chip *nand, u= 8 *buf, int len) if (ret) goto out; =20 - cmd =3D NFC_CMD_N2M | (len & GENMASK(13, 0)); + cmd =3D NFC_CMD_N2M | len; writel(cmd, nfc->reg_base + NFC_REG_CMD); =20 meson_nfc_drain_cmd(nfc); @@ -568,7 +570,7 @@ static int meson_nfc_write_buf(struct nand_chip *nand, = u8 *buf, int len) if (ret) return ret; =20 - cmd =3D NFC_CMD_M2N | (len & GENMASK(13, 0)); + cmd =3D NFC_CMD_M2N | len; writel(cmd, nfc->reg_base + NFC_REG_CMD); =20 meson_nfc_drain_cmd(nfc); @@ -899,6 +901,31 @@ meson_nand_op_put_dma_safe_output_buf(const struct nan= d_op_instr *instr, kfree(buf); } =20 +static int meson_nfc_check_op(struct nand_chip *chip, + const struct nand_operation *op) +{ + int op_id; + + for (op_id =3D 0; op_id < op->ninstrs; op_id++) { + const struct nand_op_instr *instr; + + instr =3D &op->instrs[op_id]; + + switch (instr->type) { + case NAND_OP_DATA_IN_INSTR: + case NAND_OP_DATA_OUT_INSTR: + if (instr->ctx.data.len > NFC_CMD_RAW_LEN) + return -ENOTSUPP; + + break; + default: + break; + } + } + + return 0; +} + static int meson_nfc_exec_op(struct nand_chip *nand, const struct nand_operation *op, bool check_only) { @@ -907,8 +934,13 @@ static int meson_nfc_exec_op(struct nand_chip *nand, const struct nand_op_instr *instr =3D NULL; void *buf; u32 op_id, delay_idle, cmd; + int err; int i; =20 + err =3D meson_nfc_check_op(nand, op); + if (err) + return err; + if (check_only) return 0; =20 @@ -1181,6 +1213,7 @@ static int meson_nand_attach_chip(struct nand_chip *n= and) struct meson_nfc_nand_chip *meson_chip =3D to_meson_nand(nand); struct mtd_info *mtd =3D nand_to_mtd(nand); int nsectors =3D mtd->writesize / 1024; + int raw_writesize; int ret; =20 if (!mtd->name) { @@ -1192,6 +1225,13 @@ static int meson_nand_attach_chip(struct nand_chip *= nand) return -ENOMEM; } =20 + raw_writesize =3D mtd->writesize + mtd->oobsize; + if (raw_writesize > NFC_CMD_RAW_LEN) { + dev_err(nfc->dev, "too big write size in raw mode: %d > %ld\n", + raw_writesize, NFC_CMD_RAW_LEN); + return -EINVAL; + } + if (nand->bbt_options & NAND_BBT_USE_FLASH) nand->bbt_options |=3D NAND_BBT_NO_OOB; =20 --=20 2.35.0