From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de,
Dario Binacchi <dario.binacchi@amarulasolutions.com>,
Michael Trimarchi <michael@amarulasolutions.com>
Cc: Tom Rini <trini@konsulko.com>, Sean Anderson <seanga2@gmail.com>,
Heiko Schocher <hs@denx.de>
Subject: [PATCH v2 02/15] nand: Don't dereference NULL manufacturer_desc
Date: Sat, 4 Nov 2023 16:37:40 -0400 [thread overview]
Message-ID: <20231104203753.1579217-3-seanga2@gmail.com> (raw)
In-Reply-To: <20231104203753.1579217-1-seanga2@gmail.com>
When no manufacturer is matched, manufacturer_desc is NULL. Avoid
dereferencing it in that case.
Fixes: 4e67c571252 ("mtd,ubi,ubifs: sync with linux v3.15")
Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
---
(no changes since v1)
drivers/mtd/nand/raw/nand_base.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 6b4adcf6bdc..44b6cb63a01 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -4462,17 +4462,14 @@ ident_done:
else if (chip->jedec_version)
pr_info("%s %s\n", manufacturer_desc->name,
chip->jedec_params.model);
- else
+ else if (manufacturer_desc)
pr_info("%s %s\n", manufacturer_desc->name, type->name);
#else
if (chip->jedec_version)
pr_info("%s %s\n", manufacturer_desc->name,
chip->jedec_params.model);
- else
+ else if (manufacturer_desc)
pr_info("%s %s\n", manufacturer_desc->name, type->name);
-
- pr_info("%s %s\n", manufacturer_desc->name,
- type->name);
#endif
pr_info("%d MiB, %s, erase size: %d KiB, page size: %d, OOB size: %d\n",
--
2.37.1
next prev parent reply other threads:[~2023-11-04 20:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-04 20:37 [PATCH v2 00/15] nand: Add sandbox tests Sean Anderson
2023-11-04 20:37 ` [PATCH v2 01/15] spl: nand: Fix NULL-pointer dereference Sean Anderson
2023-11-04 20:37 ` Sean Anderson [this message]
2023-11-04 20:37 ` [PATCH v2 03/15] nand: Calculate SYS_NAND_BLOCK_PAGES (neé SYS_NAND_PAGE_COUNT) automatically Sean Anderson
2023-11-04 20:37 ` [PATCH v2 04/15] nand: spl_loaders: Only read enough pages to load the image Sean Anderson
2023-11-04 20:37 ` [PATCH v2 05/15] spl: legacy: Honor bl_len when decompressing Sean Anderson
2023-11-04 20:37 ` [PATCH v2 06/15] spl: nand: Set bl_len to page size Sean Anderson
2023-11-04 20:37 ` [PATCH v2 07/15] cmd: nand: Map memory before accessing it Sean Anderson
2023-11-04 20:37 ` [PATCH v2 08/15] spl: " Sean Anderson
2023-11-04 20:37 ` [PATCH v2 09/15] mtd: Rename SPL_MTD_SUPPORT to SPL_MTD Sean Anderson
2023-11-04 20:37 ` [PATCH v2 10/15] mtd: Add some fallbacks for add/del_mtd_device Sean Anderson
2023-11-04 20:37 ` [PATCH v2 11/15] nand: Add function to unregister NAND devices Sean Anderson
2023-11-04 20:37 ` [PATCH v2 12/15] nand: Allow reinitialization Sean Anderson
2023-11-04 20:37 ` [PATCH v2 13/15] arch: sandbox: Add function to create temporary files Sean Anderson
2023-11-04 20:37 ` [PATCH v2 14/15] nand: Add sandbox driver Sean Anderson
2023-11-04 20:37 ` [PATCH v2 15/15] test: spl: Add a test for NAND Sean Anderson
2023-11-17 13:40 ` [PATCH v2 00/15] nand: Add sandbox tests Tom Rini
2023-11-18 17:09 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231104203753.1579217-3-seanga2@gmail.com \
--to=seanga2@gmail.com \
--cc=dario.binacchi@amarulasolutions.com \
--cc=hs@denx.de \
--cc=michael@amarulasolutions.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox