Skip to content

Commit 4490163

Browse files
committed
Merge: ext4: update orig_path in ext4_find_extent()
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6199 JIRA: https://issues.redhat.com/browse/RHEL-64615 CVE: CVE-2024-49881 Signed-off-by: Pavel Reichl <preichl@redhat.com> Approved-by: Carlos Maiolino <cmaiolino@redhat.com> Approved-by: Andrey Albershteyn <aalbersh@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Patrick Talbert <ptalbert@redhat.com>
2 parents 85533d4 + 823c84e commit 4490163

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

fs/ext4/extents.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,8 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
957957

958958
ext4_ext_show_path(inode, path);
959959

960+
if (orig_path)
961+
*orig_path = path;
960962
return path;
961963

962964
err:
@@ -3273,7 +3275,6 @@ static int ext4_split_extent_at(handle_t *handle,
32733275
}
32743276
depth = ext_depth(inode);
32753277
ex = path[depth].p_ext;
3276-
*ppath = path;
32773278

32783279
if (EXT4_EXT_MAY_ZEROOUT & split_flag) {
32793280
if (split_flag & (EXT4_EXT_DATA_VALID1|EXT4_EXT_DATA_VALID2)) {

fs/ext4/move_extent.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ get_ext_path(struct inode *inode, ext4_lblk_t lblock,
3636
*ppath = NULL;
3737
return -ENODATA;
3838
}
39-
*ppath = path;
4039
return 0;
4140
}
4241

0 commit comments

Comments
 (0)