From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 27/32] fs: ext4: ext_barebox: handle ext_get_inode() errors
Date: Mon, 5 Sep 2022 11:55:52 +0200 [thread overview]
Message-ID: <20220905095557.596891-28-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20220905095557.596891-1-a.fatoum@pengutronix.de>
Static analyzer laments ext_get_inode, which can fail not having its
failure condition checked. Fix this.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
fs/ext4/ext_barebox.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/fs/ext4/ext_barebox.c b/fs/ext4/ext_barebox.c
index 8f318a49c008..6c7c9885c48f 100644
--- a/fs/ext4/ext_barebox.c
+++ b/fs/ext4/ext_barebox.c
@@ -127,8 +127,8 @@ static struct dentry *ext_lookup(struct inode *dir, struct dentry *dentry,
if (ino) {
inode = ext_get_inode(dir->i_sb, ino);
-
- d_add(dentry, inode);
+ if (inode)
+ d_add(dentry, inode);
}
return NULL;
@@ -218,6 +218,8 @@ struct inode *ext_get_inode(struct super_block *sb, int ino)
node = container_of(inode, struct ext2fs_node, i);
ret = ext4fs_read_inode(fs->data, ino, &node->inode);
+ if (ret)
+ return NULL;
inode->i_ino = ino;
inode->i_mode = le16_to_cpu(node->inode.mode);
@@ -262,23 +264,27 @@ static int ext_probe(struct device_d *dev)
ret = fsdev_open_cdev(fsdev);
if (ret)
- goto err_open;
+ goto err;
fs->cdev = fsdev->cdev;
ret = ext4fs_mount(fs);
if (ret)
- goto err_mount;
+ goto err;
sb->s_op = &ext_ops;
inode = ext_get_inode(sb, 2);
+ if (!inode) {
+ ret = -EINVAL;
+ goto err;
+ }
+
sb->s_root = d_make_root(inode);
return 0;
-err_mount:
-err_open:
+err:
free(fs);
return ret;
--
2.30.2
next prev parent reply other threads:[~2022-09-05 15:38 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-05 9:55 [PATCH 00/32] treewide: fix some clang-analyze static analyzer warnings Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 01/32] clk: define stub implementation for clk_get_parent Ahmad Fatoum
2022-09-12 9:23 ` Sascha Hauer
2022-09-05 9:55 ` [PATCH 02/32] clk: have SCMI and SiFive clock controllers depend on COMMON_CLK Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 03/32] meminfo: support SANDBOX build with DEBUG log level Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 04/32] net: phy: micrel: drop useless assignment of dummy read Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 05/32] mci: core: drop useless assignment Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 06/32] nvmem: core: propagate read failure Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 07/32] fs: remove never-read initializer in mount_all() Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 08/32] usb: otg: always propagate failure to register parameters Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 09/32] usb: dwc2: gracefully handle unknown hs_phy_type Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 10/32] state: propagate failure to fixup enum32 into DT Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 11/32] of: silence warning about never-read error assignment Ahmad Fatoum
2022-09-12 9:41 ` Sascha Hauer
2022-09-05 9:55 ` [PATCH 12/32] commands: trigger: drop unused variable Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 13/32] commands: tutorial: fix memory leak Ahmad Fatoum
2022-09-12 9:44 ` Sascha Hauer
2022-09-05 9:55 ` [PATCH 14/32] bthread: fix null pointer dereference in error path Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 15/32] common: env: drop never-read initialization Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 16/32] of: refactor for of_fixup_reserved_memory() for clarity Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 17/32] password: avoid static analyzer false positive Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 18/32] regmap-mmio: regmap_mmio_get_min_stride: unify branches for readability Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 19/32] crypto: caam - delete unused variable Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 20/32] misc: ubootvar: always initialize struct ubootvar_data::flag Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 21/32] nvmem: core: drop always true condition Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 22/32] of: fdt: gracefully handle out-of-place properties Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 23/32] of: overlay: drop unused variable of_overlay_apply_dir() Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 24/32] of: partition: drop unused variable Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 25/32] serial: ns16550_pci: drop useless assignment Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 26/32] phy: core: drop useless else clause Ahmad Fatoum
2022-09-05 9:55 ` Ahmad Fatoum [this message]
2022-09-05 9:55 ` [PATCH 28/32] fs: fat: propagate f_lseek failure Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 29/32] fs: drop duplicate follow_managed() call Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 30/32] lib: parse_area_spec: guard against NULL pointer dereference Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 31/32] net: ping: propagate failure Ahmad Fatoum
2022-09-05 9:55 ` [PATCH 32/32] net: fastboot: keep error message initialized at all times Ahmad Fatoum
2022-09-12 10:06 ` [PATCH 00/32] treewide: fix some clang-analyze static analyzer warnings Sascha Hauer
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=20220905095557.596891-28-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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