From: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
To: linux-ext4@vger.kernel.org
Cc: Theodore Ts'o <tytso@mit.edu>,
linux-kernel@vger.kernel.org, Tao Ma <boyu.mt@taobao.com>,
Andreas Dilger <adilger.kernel@dilger.ca>,
kernel-dev@igalia.com,
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Subject: [PATCH 2/4] ext4: return error on ext4_find_inline_entry
Date: Wed, 21 Aug 2024 12:23:22 -0300 [thread overview]
Message-ID: <20240821152324.3621860-3-cascardo@igalia.com> (raw)
In-Reply-To: <20240821152324.3621860-1-cascardo@igalia.com>
In case of errors when reading an inode from disk or traversing inline
directory entries, return an error-encoded ERR_PTR instead of returning
NULL. ext4_find_inline_entry only caller, __ext4_find_entry already returns
such encoded errors.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
---
fs/ext4/inline.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index e7a09a99837b..7b98b1bf1dc9 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1669,8 +1669,9 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir,
void *inline_start;
int inline_size;
- if (ext4_get_inode_loc(dir, &iloc))
- return NULL;
+ ret = ext4_get_inode_loc(dir, &iloc);
+ if (ret)
+ return ERR_PTR(ret);
down_read(&EXT4_I(dir)->xattr_sem);
if (!ext4_has_inline_data(dir)) {
@@ -1701,7 +1702,10 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir,
out:
brelse(iloc.bh);
- iloc.bh = NULL;
+ if (ret < 0)
+ iloc.bh = ERR_PTR(ret);
+ else
+ iloc.bh = NULL;
out_find:
up_read(&EXT4_I(dir)->xattr_sem);
return iloc.bh;
--
2.34.1
next prev parent reply other threads:[~2024-08-21 15:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-21 15:23 [PATCH 0/4] ext4: avoid OOB when system.data xattr changes underneath the filesystem Thadeu Lima de Souza Cascardo
2024-08-21 15:23 ` [PATCH 1/4] ext4: ext4_search_dir should return a proper error Thadeu Lima de Souza Cascardo
2024-08-21 15:23 ` Thadeu Lima de Souza Cascardo [this message]
2024-08-21 15:23 ` [PATCH 3/4] ext4: explicitly exit when ext4_find_inline_entry returns an error Thadeu Lima de Souza Cascardo
2024-08-21 15:23 ` [PATCH 4/4] ext4: avoid OOB when system.data xattr changes underneath the filesystem Thadeu Lima de Souza Cascardo
2024-09-05 14:53 ` [PATCH 0/4] " Theodore Ts'o
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=20240821152324.3621860-3-cascardo@igalia.com \
--to=cascardo@igalia.com \
--cc=adilger.kernel@dilger.ca \
--cc=boyu.mt@taobao.com \
--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®