1
1
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2
2
From: Alex Shumsky <
[email protected] >
3
- Date: Mon , 14 Jun 2024 19:01:48 +0000
3
+ Date: Fri , 14 Jun 2024 19:01:48 +0000
4
4
Subject: fs/btrfs: fix out of bounds write
5
5
6
6
Signed-off-by: Alex Shumsky <
[email protected] >
9
9
1 file changed, 2 insertions(+), 2 deletions(-)
10
10
11
11
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
12
- index 4691612eda..b51f578b49 100644
12
+ index 111111111111..222222222222 100644
13
13
--- a/fs/btrfs/inode.c
14
14
+++ b/fs/btrfs/inode.c
15
- @@ -638,11 +638,11 @@ static int read_and_truncate_page(struct btrfs_path *path,
16
- return -ENOMEM;
17
-
15
+ @@ -640,7 +640,7 @@ static int read_and_truncate_page(struct btrfs_path *path,
18
16
extent_type = btrfs_file_extent_type(leaf, fi);
19
17
if (extent_type == BTRFS_FILE_EXTENT_INLINE) {
20
18
ret = btrfs_read_extent_inline(path, fi, buf);
@@ -23,11 +21,7 @@ index 4691612eda..b51f578b49 100644
23
21
free(buf);
24
22
return len;
25
23
}
26
-
27
- ret = btrfs_read_extent_reg(path, fi,
28
- @@ -650,11 +650,11 @@ static int read_and_truncate_page(struct btrfs_path *path,
29
- fs_info->sectorsize, buf);
30
- if (ret < 0) {
24
+ @@ -652,7 +652,7 @@ static int read_and_truncate_page(struct btrfs_path *path,
31
25
free(buf);
32
26
return ret;
33
27
}
@@ -36,8 +30,6 @@ index 4691612eda..b51f578b49 100644
36
30
free(buf);
37
31
return len;
38
32
}
39
-
40
- int btrfs_file_read(struct btrfs_root *root, u64 ino, u64 file_offset, u64 len,
41
33
- -
42
- Created with Armbian build tools https://github.com/armbian/build
34
+ Armbian
43
35
0 commit comments