From: Allison Henderson <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org, wen.xu@gatech.edu
Subject: Re: [PATCH 6/6] xfs: don't crash the vfs on a garbage inline symlink
Date: Sun, 12 Aug 2018 00:54:09 -0700 [thread overview]
Message-ID: <41513717-cb71-c46b-6f28-564fce14cda8@oracle.com> (raw)
In-Reply-To: <153400173428.27471.504421086760762828.stgit@magnolia>
On 08/11/2018 08:35 AM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> The VFS routine that calls ->get_link blindly copies whatever's returned
> into the user's buffer. If we return a NULL pointer, the vfs will
> crash on the null pointer. Therefore, return -EFSCORRUPTED instead of
> blowing up the kernel.
>
> Reported-by: wen.xu@gatech.edu
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/xfs_iops.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>
> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
> index 0ef5ad7fb851..26007a9db49d 100644
> --- a/fs/xfs/xfs_iops.c
> +++ b/fs/xfs/xfs_iops.c
> @@ -471,8 +471,16 @@ xfs_vn_get_link_inline(
> struct inode *inode,
> struct delayed_call *done)
> {
> + char *ptr;
> +
> ASSERT(XFS_I(inode)->i_df.if_flags & XFS_IFINLINE);
> - return XFS_I(inode)->i_df.if_u1.if_data;
> +
> + /*
> + * The VFS crashes on a NULL pointer, so return -EFSCORRUPTED if
> + * if_data is junk.
> + */
> + ptr = XFS_I(inode)->i_df.if_u1.if_data;
> + return ptr ? ptr : ERR_PTR(-EFSCORRUPTED);
> }
>
> STATIC int
>
Ok, looks fine.
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
next prev parent reply other threads:[~2018-08-12 10:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-11 15:34 [PATCH v2 0/6] xfs-4.19: various fixes Darrick J. Wong
2018-08-11 15:35 ` [PATCH 1/6] xfs: recalculate summary counters at mount time if icount is bad Darrick J. Wong
2018-08-12 7:53 ` Allison Henderson
2018-08-13 7:46 ` Carlos Maiolino
2018-08-11 15:35 ` [PATCH 2/6] xfs: xrep_findroot_block should reject root blocks with siblings Darrick J. Wong
2018-08-12 7:53 ` Allison Henderson
2018-08-13 7:48 ` Carlos Maiolino
2018-08-13 16:56 ` Brian Foster
2018-09-27 23:20 ` Darrick J. Wong
2018-08-11 15:35 ` [PATCH 3/6] xfs: sanity check ag header values in xrep_calc_ag_resblks Darrick J. Wong
2018-08-12 7:55 ` Allison Henderson
2018-08-13 7:52 ` Carlos Maiolino
2018-08-11 15:35 ` [PATCH 4/6] xfs: fix buffer state management in xrep_findroot_block Darrick J. Wong
2018-08-12 7:53 ` Allison Henderson
2018-08-13 8:05 ` Carlos Maiolino
2018-08-13 16:56 ` Brian Foster
2018-09-28 0:32 ` Darrick J. Wong
2018-08-13 22:56 ` Dave Chinner
2018-09-28 0:28 ` Darrick J. Wong
2018-08-11 15:35 ` [PATCH 5/6] iomap: fix WARN_ON_ONCE on uninitialized variable Darrick J. Wong
2018-08-12 7:55 ` Allison Henderson
2018-08-13 8:07 ` Carlos Maiolino
2018-08-11 15:35 ` [PATCH 6/6] xfs: don't crash the vfs on a garbage inline symlink Darrick J. Wong
2018-08-12 7:54 ` Allison Henderson [this message]
2018-08-13 7:23 ` Christoph Hellwig
2018-09-28 0:31 ` Darrick J. Wong
2018-08-19 21:07 ` Xu, Wen
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=41513717-cb71-c46b-6f28-564fce14cda8@oracle.com \
--to=allison.henderson@oracle.com \
--cc=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=wen.xu@gatech.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).