From: Kangjie Lu <kjlu@umn.edu>
To: kjlu@umn.edu
Cc: pakki001@umn.edu, David Sterba <dsterba@suse.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] fs: affs: fix a NULL pointer dereference
Date: Thu, 14 Mar 2019 02:46:05 -0500 [thread overview]
Message-ID: <20190314074607.28041-1-kjlu@umn.edu> (raw)
If affs_bread fails, do not use ext_bh to avoid NULL pointer
dereference
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
---
fs/affs/file.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/fs/affs/file.c b/fs/affs/file.c
index a85817f54483..45b96faa40f1 100644
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -835,7 +835,7 @@ void
affs_truncate(struct inode *inode)
{
struct super_block *sb = inode->i_sb;
- u32 ext, ext_key;
+ u32 ext, ext_key, ext_bk;
u32 last_blk, blkcnt, blk;
u32 size;
struct buffer_head *ext_bh;
@@ -941,8 +941,12 @@ affs_truncate(struct inode *inode)
size = AFFS_SB(sb)->s_hashsize;
if (size > blkcnt - blk)
size = blkcnt - blk;
- for (i = 0; i < size; i++, blk++)
- affs_free_block(sb, be32_to_cpu(AFFS_BLOCK(sb, ext_bh, i)));
+ if (ext_bh) {
+ for (i = 0; i < size; i++, blk++) {
+ ext_bk = AFFS_BLOCK(sb, ext_bh, i);
+ affs_free_block(sb, be32_to_cpu(ext_bk));
+ }
+ }
affs_free_block(sb, ext_key);
ext_key = be32_to_cpu(AFFS_TAIL(sb, ext_bh)->extension);
affs_brelse(ext_bh);
--
2.17.1
next reply other threads:[~2019-03-14 7:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-14 7:46 Kangjie Lu [this message]
2019-03-14 14:51 ` [PATCH] fs: affs: fix a NULL pointer dereference kbuild test robot
2019-03-19 9:00 ` Dan Carpenter
2019-03-19 13:43 ` Geert Uytterhoeven
2019-03-15 7:42 Kangjie Lu
2019-03-21 14:45 ` David Sterba
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=20190314074607.28041-1-kjlu@umn.edu \
--to=kjlu@umn.edu \
--cc=dsterba@suse.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pakki001@umn.edu \
/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;
as well as URLs for NNTP newsgroup(s).