29 lines
913 B
Diff
29 lines
913 B
Diff
|
From a972f4096b7c730acf57db35df01ea3788de986a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Karel Zak <kzak@redhat.com>
|
||
|
|
Date: Tue, 30 Apr 2024 11:04:32 +0200
|
||
|
|
Subject: [PATCH] fsck.minix: fix possible overrun
|
||
|
|
|
||
|
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||
|
|
Reference:https://github.com/util-linux/util-linux/commit/a972f4096b7c730acf57db35df01ea3788de986a
|
||
|
|
Conflict:NA
|
||
|
|
---
|
||
|
|
disk-utils/fsck.minix.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
|
||
|
|
index 03a47460e..08903587b 100644
|
||
|
|
--- a/disk-utils/fsck.minix.c
|
||
|
|
+++ b/disk-utils/fsck.minix.c
|
||
|
|
@@ -548,7 +548,7 @@ get_dirsize(void) {
|
||
|
|
block = Inode[ROOT_INO].i_zone[0];
|
||
|
|
read_block(block, blk);
|
||
|
|
|
||
|
|
- for (size = 16; size < MINIX_BLOCK_SIZE; size <<= 1) {
|
||
|
|
+ for (size = 16; size + 2 < MINIX_BLOCK_SIZE; size <<= 1) {
|
||
|
|
if (strcmp(blk + size + 2, "..") == 0) {
|
||
|
|
dirsize = size;
|
||
|
|
namelen = size - 2;
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|