patch/u-boot/v2024.04: rewrite patches, no changes

armbian · Jun 29, 2024 · d34921d · d34921d
1 parent 7c60e27
commit d34921d
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/patch/u-boot/v2024.04/general-btrfs-fix-out-of-bounds-write.patch b/patch/u-boot/v2024.04/general-btrfs-fix-out-of-bounds-write.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Alex Shumsky <alexthreed@gmail.com>
-Date: Mon, 14 Jun 2024 19:01:48 +0000
+Date: Fri, 14 Jun 2024 19:01:48 +0000
 Subject: fs/btrfs: fix out of bounds write
 
 Signed-off-by: Alex Shumsky <alexthreed@gmail.com>
@@ -9,12 +9,10 @@ Signed-off-by: Alex Shumsky <alexthreed@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
-index 4691612eda..b51f578b49 100644
+index 111111111111..222222222222 100644
 --- a/fs/btrfs/inode.c
 +++ b/fs/btrfs/inode.c
-@@ -638,11 +638,11 @@ static int read_and_truncate_page(struct btrfs_path *path,
- 		return -ENOMEM;
-
+@@ -640,7 +640,7 @@ static int read_and_truncate_page(struct btrfs_path *path,
  	extent_type = btrfs_file_extent_type(leaf, fi);
  	if (extent_type == BTRFS_FILE_EXTENT_INLINE) {
  		ret = btrfs_read_extent_inline(path, fi, buf);
@@ -23,11 +21,7 @@ index 4691612eda..b51f578b49 100644
  		free(buf);
  		return len;
  	}
-
- 	ret = btrfs_read_extent_reg(path, fi,
-@@ -650,11 +650,11 @@ static int read_and_truncate_page(struct btrfs_path *path,
- 			fs_info->sectorsize, buf);
- 	if (ret < 0) {
+@@ -652,7 +652,7 @@ static int read_and_truncate_page(struct btrfs_path *path,
  		free(buf);
  		return ret;
  	}
@@ -36,8 +30,6 @@ index 4691612eda..b51f578b49 100644
  	free(buf);
  	return len;
  }
-
- int btrfs_file_read(struct btrfs_root *root, u64 ino, u64 file_offset, u64 len,
 -- 
-Created with Armbian build tools https://github.com/armbian/build
+Armbian