From: Julia Lawall <julia@diku.dk>
To: Chris Mason <chris.mason@oracle.com>
Cc: kernel-janitors@vger.kernel.org, linux-btrfs@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] fs/btrfs/inode.c: Add missing IS_ERR test
Date: Mon, 24 Jan 2011 20:55:19 +0100 [thread overview]
Message-ID: <1295898922-18822-2-git-send-email-julia@diku.dk> (raw)
In-Reply-To: <1295898922-18822-1-git-send-email-julia@diku.dk>
After the conditional that precedes the following code, inode may be an
ERR_PTR value. This can eg result from a memory allocation failure via the
call to btrfs_iget, and thus does not imply that root is different than
sub_root. Thus, an IS_ERR check is added to ensure that there is no
dereference of inode in this case.
The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r@
identifier f;
@@
f(...) { ... return ERR_PTR(...); }
@@
identifier r.f, fld;
expression x;
statement S1,S2;
@@
x = f(...)
... when != IS_ERR(x)
(
if (IS_ERR(x) ||...) S1 else S2
|
*x->fld
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
fs/btrfs/inode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 160b55b..b322158 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4134,7 +4134,7 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
}
srcu_read_unlock(&root->fs_info->subvol_srcu, index);
- if (root != sub_root) {
+ if (!IS_ERR(inode) && root != sub_root) {
down_read(&root->fs_info->cleanup_work_sem);
if (!(inode->i_sb->s_flags & MS_RDONLY))
btrfs_orphan_cleanup(sub_root);
next prev parent reply other threads:[~2011-01-24 19:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-24 19:55 [PATCH 0/4] Add missing IS_ERR test Julia Lawall
2011-01-24 19:55 ` Julia Lawall [this message]
2011-01-24 19:55 ` [PATCH 2/4] arch/arm/mach-at91/clock.c: " Julia Lawall
2011-01-24 19:56 ` Ryan Mallon
2011-01-24 20:00 ` Julia Lawall
2011-01-24 20:05 ` Vasiliy Kulikov
2011-01-24 20:09 ` Julia Lawall
2011-01-24 20:14 ` Vasiliy Kulikov
2011-01-25 10:33 ` walter harms
2011-01-25 10:43 ` Russell King - ARM Linux
2011-01-25 11:12 ` walter harms
2011-01-25 11:17 ` Russell King - ARM Linux
2011-01-25 11:18 ` Julia Lawall
2011-01-25 11:26 ` Russell King - ARM Linux
2011-01-25 11:31 ` Julia Lawall
2011-01-24 20:11 ` Ryan Mallon
2011-01-24 20:28 ` Julia Lawall
2011-01-24 20:38 ` Ryan Mallon
2011-01-24 21:01 ` Julia Lawall
2011-01-24 21:06 ` Ryan Mallon
2011-01-24 21:31 ` Julia Lawall
2011-01-24 21:51 ` Ryan Mallon
2011-01-24 23:23 ` Russell King - ARM Linux
2011-01-25 1:44 ` Jean-Christophe PLAGNIOL-VILLARD
2011-01-25 6:12 ` Julia Lawall
2011-01-25 17:23 ` Jean-Christophe PLAGNIOL-VILLARD
2011-01-24 19:55 ` [PATCH 3/4] drivers/video/bf537-lq035.c: " Julia Lawall
2011-01-24 20:43 ` Mike Frysinger
2011-01-25 6:12 ` Paul Mundt
2011-01-25 8:36 ` Hennerich, Michael
2011-01-24 19:55 ` [PATCH 4/4] arch/arm/mach-omap2/smartreflex.c: " Julia Lawall
2011-01-24 21:24 ` Kevin Hilman
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=1295898922-18822-2-git-send-email-julia@diku.dk \
--to=julia@diku.dk \
--cc=chris.mason@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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