Skip to content

Commit d34921d

Browse files
committed
patch/u-boot/v2024.04: rewrite patches, no changes
1 parent 7c60e27 commit d34921d

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed
Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
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
44
Subject: fs/btrfs: fix out of bounds write
55

66
Signed-off-by: Alex Shumsky <[email protected]>
@@ -9,12 +9,10 @@ Signed-off-by: Alex Shumsky <[email protected]>
99
1 file changed, 2 insertions(+), 2 deletions(-)
1010

1111
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
12-
index 4691612eda..b51f578b49 100644
12+
index 111111111111..222222222222 100644
1313
--- a/fs/btrfs/inode.c
1414
+++ 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,
1816
extent_type = btrfs_file_extent_type(leaf, fi);
1917
if (extent_type == BTRFS_FILE_EXTENT_INLINE) {
2018
ret = btrfs_read_extent_inline(path, fi, buf);
@@ -23,11 +21,7 @@ index 4691612eda..b51f578b49 100644
2321
free(buf);
2422
return len;
2523
}
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,
3125
free(buf);
3226
return ret;
3327
}
@@ -36,8 +30,6 @@ index 4691612eda..b51f578b49 100644
3630
free(buf);
3731
return len;
3832
}
39-
40-
int btrfs_file_read(struct btrfs_root *root, u64 ino, u64 file_offset, u64 len,
4133
--
42-
Created with Armbian build tools https://github.com/armbian/build
34+
Armbian
4335

0 commit comments

Comments
 (0)