From: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
To: linux-ext4@vger.kernel.org
Cc: "Theodore Ts'o" <tytso@mit.edu>,
Andreas Dilger <adilger.kernel@dilger.ca>,
linux-kernel@vger.kernel.org, kernel-dev@igalia.com,
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Subject: [PATCH 5/5] ext4: make i_inline_off point to data
Date: Fri, 6 Dec 2024 14:28:28 -0300 [thread overview]
Message-ID: <20241206172828.3219989-6-cascardo@igalia.com> (raw)
In-Reply-To: <20241206172828.3219989-1-cascardo@igalia.com>
Instead of having i_inline_off pointing to the xattr entry, make it point
directly to the value offset. That will allow e_value_offs to be ignored,
preventing many issues where it might have changed on disk after being
validated.
This prevents many potential out-of-bound accesses.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
---
fs/ext4/inline.c | 35 +++++++++++------------------------
1 file changed, 11 insertions(+), 24 deletions(-)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index cd2014af9823..92e300c3f873 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -133,7 +133,12 @@ static void ext4_update_inline_off_size(struct inode *inode,
struct ext4_inode *raw_inode,
struct ext4_xattr_entry *entry)
{
- EXT4_I(inode)->i_inline_off = (u16)((void *)entry - (void *)raw_inode);
+ struct ext4_xattr_ibody_header *header;
+ void *off;
+
+ header = IHDR(inode, raw_inode);
+ off = (void *)IFIRST(header) + le16_to_cpu(entry->e_value_offs);
+ EXT4_I(inode)->i_inline_off = (u16)(off - (void *)raw_inode);
EXT4_I(inode)->i_inline_size = EXT4_MIN_INLINE_DATA_SIZE +
le32_to_cpu(entry->e_value_size);
}
@@ -184,8 +189,6 @@ static int ext4_read_inline_data(struct inode *inode, void *buffer,
unsigned int len,
struct ext4_iloc *iloc)
{
- struct ext4_xattr_entry *entry;
- struct ext4_xattr_ibody_header *header;
int cp_len = 0;
struct ext4_inode *raw_inode;
@@ -205,14 +208,7 @@ static int ext4_read_inline_data(struct inode *inode, void *buffer,
if (!len)
goto out;
- header = IHDR(inode, raw_inode);
- entry = (struct ext4_xattr_entry *)((void *)raw_inode +
- EXT4_I(inode)->i_inline_off);
- len = min_t(unsigned int, len,
- (unsigned int)le32_to_cpu(entry->e_value_size));
-
- memcpy(buffer,
- (void *)IFIRST(header) + le16_to_cpu(entry->e_value_offs), len);
+ memcpy(buffer, (void *)raw_inode + EXT4_I(inode)->i_inline_off, len);
cp_len += len;
out:
@@ -273,8 +269,6 @@ static int ext4_read_inline_data_from_inode(struct inode *inode, void **buffer,
static void ext4_write_inline_data(struct inode *inode, struct ext4_iloc *iloc,
void *buffer, loff_t pos, unsigned int len)
{
- struct ext4_xattr_entry *entry;
- struct ext4_xattr_ibody_header *header;
struct ext4_inode *raw_inode;
int cp_len = 0;
@@ -301,11 +295,8 @@ static void ext4_write_inline_data(struct inode *inode, struct ext4_iloc *iloc,
return;
pos -= EXT4_MIN_INLINE_DATA_SIZE;
- header = IHDR(inode, raw_inode);
- entry = (struct ext4_xattr_entry *)((void *)raw_inode +
- EXT4_I(inode)->i_inline_off);
- memcpy((void *)IFIRST(header) + le16_to_cpu(entry->e_value_offs) + pos,
+ memcpy((void *)raw_inode + EXT4_I(inode)->i_inline_off + pos,
buffer, len);
}
@@ -1085,16 +1076,12 @@ static int ext4_add_dirent_to_inline(handle_t *handle,
static void *ext4_get_inline_xattr_pos(struct inode *inode,
struct ext4_iloc *iloc)
{
- struct ext4_xattr_entry *entry;
- struct ext4_xattr_ibody_header *header;
+ struct ext4_inode *raw_inode;
BUG_ON(!EXT4_I(inode)->i_inline_off);
- header = IHDR(inode, ext4_raw_inode(iloc));
- entry = (struct ext4_xattr_entry *)((void *)ext4_raw_inode(iloc) +
- EXT4_I(inode)->i_inline_off);
-
- return (void *)IFIRST(header) + le16_to_cpu(entry->e_value_offs);
+ raw_inode = ext4_raw_inode(iloc);
+ return (void *)raw_inode + EXT4_I(inode)->i_inline_off;
}
/* Set the final de to cover the whole block. */
--
2.34.1
prev parent reply other threads:[~2024-12-06 17:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-06 17:28 [PATCH 0/5] ext4: inline data cleanup Thadeu Lima de Souza Cascardo
2024-12-06 17:28 ` [PATCH 1/5] ext4: inline: remove extra size check when writing data Thadeu Lima de Souza Cascardo
2024-12-06 17:28 ` [PATCH 2/5] ext4: inline: use cached i_inline_size instead of e_value_size Thadeu Lima de Souza Cascardo
2024-12-06 17:28 ` [PATCH 3/5] ext4: introduce wrapper to read data from inode Thadeu Lima de Souza Cascardo
2024-12-06 17:28 ` [PATCH 4/5] ext4: add a wrapper to update i_inline_off and i_inline_size Thadeu Lima de Souza Cascardo
2024-12-06 17:28 ` Thadeu Lima de Souza Cascardo [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=20241206172828.3219989-6-cascardo@igalia.com \
--to=cascardo@igalia.com \
--cc=adilger.kernel@dilger.ca \
--cc=kernel-dev@igalia.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.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
all inboxes | Powered by JetHome®