From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: xfs <linux-xfs@vger.kernel.org>, Christoph Hellwig <hch@infradead.org>
Subject: Re: [PATCH] xfs: always init bma in xfs_bmapi_write
Date: Tue, 19 Mar 2019 09:01:13 -0400 [thread overview]
Message-ID: <20190319130112.GC23863@bfoster> (raw)
In-Reply-To: <20190318164401.GP4929@magnolia>
On Mon, Mar 18, 2019 at 09:44:01AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Always init the tp/ip fields of bma in xfs_bmapi_write so that the
> bmapi_finish at the bottom never trips over null transaction or inode
> pointers.
>
> Coverity-id: 1443964
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_bmap.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 625ddfb9653e..17c7168966c6 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -4254,9 +4254,13 @@ xfs_bmapi_write(
> struct xfs_bmbt_irec *mval, /* output: map values */
> int *nmap) /* i/o: mval size/count */
> {
> + struct xfs_bmalloca bma = {
> + .tp = tp,
> + .ip = ip,
> + .total = total,
> + };
This should continue to zero-init the rest of the structure, right? If
so, looks fine:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> struct xfs_mount *mp = ip->i_mount;
> struct xfs_ifork *ifp;
> - struct xfs_bmalloca bma = { NULL }; /* args for xfs_bmap_alloc */
> xfs_fileoff_t end; /* end of mapped file region */
> bool eof = false; /* after the end of extents */
> int error; /* error return */
> @@ -4324,10 +4328,6 @@ xfs_bmapi_write(
> eof = true;
> if (!xfs_iext_peek_prev_extent(ifp, &bma.icur, &bma.prev))
> bma.prev.br_startoff = NULLFILEOFF;
> - bma.tp = tp;
> - bma.ip = ip;
> - bma.total = total;
> - bma.datatype = 0;
> bma.minleft = xfs_bmapi_minleft(tp, ip, whichfork);
>
> n = 0;
next prev parent reply other threads:[~2019-03-19 13:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-18 16:44 [PATCH] xfs: always init bma in xfs_bmapi_write Darrick J. Wong
2019-03-19 13:01 ` Brian Foster [this message]
2019-03-19 15:15 ` Darrick J. Wong
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=20190319130112.GC23863@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=hch@infradead.org \
--cc=linux-xfs@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