All of lore.kernel.org
 help / color / mirror / Atom feed
From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v2 01/18] xfsprogs: zero inode fork buffer at allocation
Date: Fri, 20 May 2022 12:00:14 -0700	[thread overview]
Message-ID: <20220520190031.2198236-2-allison.henderson@oracle.com> (raw)
In-Reply-To: <20220520190031.2198236-1-allison.henderson@oracle.com>

From: Dave Chinner <dchinner@redhat.com>

Source kernel commit: cb512c921639613ce03f87e62c5e93ed9fe8c84d

When we first allocate or resize an inline inode fork, we round up
the allocation to 4 byte alingment to make journal alignment
constraints. We don't clear the unused bytes, so we can copy up to
three uninitialised bytes into the journal. Zero those bytes so we
only ever copy zeros into the journal.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
 libxfs/xfs_inode_fork.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index d6ac13eea764..a2af6d71948e 100644
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -48,8 +48,13 @@ xfs_init_local_fork(
 		mem_size++;
 
 	if (size) {
+		/*
+		 * As we round up the allocation here, we need to ensure the
+		 * bytes we don't copy data into are zeroed because the log
+		 * vectors still copy them into the journal.
+		 */
 		real_size = roundup(mem_size, 4);
-		ifp->if_u1.if_data = kmem_alloc(real_size, KM_NOFS);
+		ifp->if_u1.if_data = kmem_zalloc(real_size, KM_NOFS);
 		memcpy(ifp->if_u1.if_data, data, size);
 		if (zero_terminate)
 			ifp->if_u1.if_data[size] = '\0';
@@ -498,10 +503,11 @@ xfs_idata_realloc(
 	/*
 	 * For inline data, the underlying buffer must be a multiple of 4 bytes
 	 * in size so that it can be logged and stay on word boundaries.
-	 * We enforce that here.
+	 * We enforce that here, and use __GFP_ZERO to ensure that size
+	 * extensions always zero the unused roundup area.
 	 */
 	ifp->if_u1.if_data = krealloc(ifp->if_u1.if_data, roundup(new_size, 4),
-				      GFP_NOFS | __GFP_NOFAIL);
+				      GFP_NOFS | __GFP_NOFAIL | __GFP_ZERO);
 	ifp->if_bytes = new_size;
 }
 
-- 
2.25.1


  reply	other threads:[~2022-05-20 19:00 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-20 19:00 [PATCH v2 00/18] xfsprogs: Port larp, enable injects and log print for attri/d Allison Henderson
2022-05-20 19:00 ` Allison Henderson [this message]
2022-05-20 19:00 ` [PATCH v2 02/18] xfsprogs: hide log iovec alignment constraints Allison Henderson
2022-05-20 19:00 ` [PATCH v2 03/18] xfsprogs: don't commit the first deferred transaction without intents Allison Henderson
2022-05-20 19:00 ` [PATCH v2 04/18] xfsprogs: tag transactions that contain intent done items Allison Henderson
2022-05-20 19:00 ` [PATCH v2 05/18] xfsprogs: Fix double unlock in defer capture code Allison Henderson
2022-05-20 19:00 ` [PATCH v2 06/18] xfsprogs: Return from xfs_attr_set_iter if there are no more rmtblks to process Allison Henderson
2022-05-20 19:00 ` [PATCH v2 07/18] xfsprogs: Set up infrastructure for log attribute replay Allison Henderson
2022-05-20 19:00 ` [PATCH v2 08/18] xfsprogs: Implement attr logging and replay Allison Henderson
2022-05-20 19:00 ` [PATCH v2 09/18] xfsprogs: Skip flip flags for delayed attrs Allison Henderson
2022-05-20 19:00 ` [PATCH v2 10/18] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2022-05-20 19:00 ` [PATCH v2 11/18] xfsprogs: Remove unused xfs_attr_*_args Allison Henderson
2022-05-20 19:00 ` [PATCH v2 12/18] xfsprogs: Add log attribute error tag Allison Henderson
2022-05-20 19:00 ` [PATCH v2 13/18] xfsprogs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2022-05-20 19:00 ` [PATCH v2 14/18] xfsprogs: Add helper function xfs_attr_leaf_addname Allison Henderson
2022-05-20 19:00 ` [PATCH v2 15/18] xfsprogs: Add helper function xfs_init_attr_trans Allison Henderson
2022-05-20 19:00 ` [PATCH v2 16/18] xfsprogs: add leaf split error tag Allison Henderson
2022-05-20 19:00 ` [PATCH v2 17/18] xfsprogs: add leaf to node " Allison Henderson
2022-05-20 19:00 ` [PATCH v2 18/18] xfs_logprint: Add log item printing for ATTRI and ATTRD Allison Henderson
2022-05-31  6:03   ` Dave Chinner
2022-06-01  1:39     ` Alli

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=20220520190031.2198236-2-allison.henderson@oracle.com \
    --to=allison.henderson@oracle.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.