From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: "Bill O'Donnell" <billodo@redhat.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v4] xfs: assure zeroed memory buffers for certain kmem allocations
Date: Tue, 24 Sep 2019 08:17:29 -0700 [thread overview]
Message-ID: <20190924151729.GY2229799@magnolia> (raw)
In-Reply-To: <20190919210138.13535-1-billodo@redhat.com>
On Thu, Sep 19, 2019 at 04:01:38PM -0500, Bill O'Donnell wrote:
> Guarantee zeroed memory buffers for cases where potential memory
> leak to disk can occur. In these cases, kmem_alloc is used and
> doesn't zero the buffer, opening the possibility of information
> leakage to disk.
>
> Use existing infrastucture (xfs_buf_allocate_memory) to obtain
> the already zeroed buffer from kernel memory.
>
> This solution avoids the performance issue that would occur if a
> wholesale change to replace kmem_alloc with kmem_zalloc was done.
>
> Signed-off-by: Bill O'Donnell <billodo@redhat.com>
> ---
> v4: use __GFP_ZERO as part of gfp_mask (instead of KM_ZERO)
> v3: remove XBF_ZERO flag, and instead use XBF_READ flag only.
> v2: zeroed buffer not required for XBF_READ case. Correct placement
> and rename the XBF_ZERO flag.
>
> fs/xfs/xfs_buf.c | 12 +++++++++++-
/me wakes up and wonders, what about the other kmem_alloc_io callers in
xfs? I think we need to slip a KM_ZERO into the allocation call when we
allocate the log buffers, right? What about log recovery?
--D
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 120ef99d09e8..5d0a68de5fa6 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -345,6 +345,15 @@ xfs_buf_allocate_memory(
> unsigned short page_count, i;
> xfs_off_t start, end;
> int error;
> + uint kmflag_mask = 0;
> +
> + /*
> + * assure zeroed buffer for non-read cases.
> + */
> + if (!(flags & XBF_READ)) {
> + kmflag_mask |= KM_ZERO;
> + gfp_mask |= __GFP_ZERO;
> + }
>
> /*
> * for buffers that are contained within a single page, just allocate
> @@ -354,7 +363,8 @@ xfs_buf_allocate_memory(
> size = BBTOB(bp->b_length);
> if (size < PAGE_SIZE) {
> int align_mask = xfs_buftarg_dma_alignment(bp->b_target);
> - bp->b_addr = kmem_alloc_io(size, align_mask, KM_NOFS);
> + bp->b_addr = kmem_alloc_io(size, align_mask,
> + KM_NOFS | kmflag_mask);
> if (!bp->b_addr) {
> /* low memory - use alloc_page loop instead */
> goto use_alloc_page;
> --
> 2.21.0
>
prev parent reply other threads:[~2019-09-24 15:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 15:35 [PATCH] xfs: assure zeroed memory buffers for certain kmem allocations Bill O'Donnell
2019-09-16 21:24 ` Eric Sandeen
2019-09-16 21:30 ` Darrick J. Wong
2019-09-16 21:32 ` Bill O'Donnell
2019-09-16 21:54 ` Dave Chinner
2019-09-18 15:47 ` [PATCH v2] " Bill O'Donnell
2019-09-18 16:32 ` Darrick J. Wong
2019-09-18 22:11 ` Bill O'Donnell
2019-09-19 15:01 ` [PATCH v3] " Bill O'Donnell
2019-09-19 17:03 ` Christoph Hellwig
2019-09-19 17:20 ` Bill O'Donnell
2019-09-19 17:38 ` Christoph Hellwig
2019-09-20 14:59 ` Eric Sandeen
2019-09-24 4:13 ` Dave Chinner
2019-09-19 21:01 ` [PATCH v4] " Bill O'Donnell
2019-09-24 5:47 ` Darrick J. Wong
2019-09-24 15:17 ` Darrick J. Wong [this message]
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=20190924151729.GY2229799@magnolia \
--to=darrick.wong@oracle.com \
--cc=billodo@redhat.com \
--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