From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Kangjie Lu <kjlu@umn.edu>
Cc: pakki001@umn.edu, David Sterba <dsterba@suse.com>,
Linux FS Devel <linux-fsdevel@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] fs: affs: fix a NULL pointer dereference
Date: Tue, 19 Mar 2019 14:43:04 +0100 [thread overview]
Message-ID: <CAMuHMdX0ShS8d11kYDYoce=yaqphMvWdyqocsZczF8+EkSSkuw@mail.gmail.com> (raw)
In-Reply-To: <20190314074607.28041-1-kjlu@umn.edu>
Hi Kangjie,
On Thu, Mar 14, 2019 at 8:47 AM Kangjie Lu <kjlu@umn.edu> wrote:
> If affs_bread fails, do not use ext_bh to avoid NULL pointer
> dereference
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Thanks for your patch!
> --- 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;
Why adding an intermediate variable (without __be32 tag)?
> 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));
> + }
Now this ignores all errors, silently.
What about handling actual errors, and propagating them up?
> + }
> affs_free_block(sb, ext_key);
> ext_key = be32_to_cpu(AFFS_TAIL(sb, ext_bh)->extension);
> affs_brelse(ext_bh);
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2019-03-19 13:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-14 7:46 [PATCH] fs: affs: fix a NULL pointer dereference Kangjie Lu
2019-03-14 14:51 ` kbuild test robot
2019-03-19 9:00 ` Dan Carpenter
2019-03-19 13:43 ` Geert Uytterhoeven [this message]
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='CAMuHMdX0ShS8d11kYDYoce=yaqphMvWdyqocsZczF8+EkSSkuw@mail.gmail.com' \
--to=geert@linux-m68k.org \
--cc=dsterba@suse.com \
--cc=kjlu@umn.edu \
--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).