diff options
| author | Thadeu Lima de Souza Cascardo <cascardo@igalia.com> | 2024-08-21 12:23:22 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-17 15:20:59 +0200 |
| commit | f595035794f923157ce077df6031a88fa55ad9fb (patch) | |
| tree | 73e9f72eab83262a92e630c0d97b368f227c91ce | |
| parent | e953cb3f6d93e0b1a6d347a15eb3f07eba420851 (diff) | |
| download | linux-f595035794f923157ce077df6031a88fa55ad9fb.tar.gz linux-f595035794f923157ce077df6031a88fa55ad9fb.tar.bz2 linux-f595035794f923157ce077df6031a88fa55ad9fb.zip | |
ext4: return error on ext4_find_inline_entry
[ Upstream commit 4d231b91a944f3cab355fce65af5871fb5d7735b ]
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>
Link: https://patch.msgid.link/20240821152324.3621860-3-cascardo@igalia.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Stable-dep-of: c6b72f5d82b1 ("ext4: avoid OOB when system.data xattr changes underneath the filesystem")
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | fs/ext4/inline.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index ee9d2faa5218..e6c2650335a9 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1698,8 +1698,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)) { @@ -1730,7 +1731,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; |