misc/fsck.c: processes may kill other processes

Fix issue: https://gitee.com/e2fsprogs/issues/I6BSCH

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
(cherry picked from commit 7762bf942e3de8e5b09d94152ce606cf1ebcfdd3)
This commit is contained in:
Zhiqiang Liu 2023-03-30 20:13:48 +08:00 committed by openeuler-sync-bot
parent 30fc74348a
commit 62da9fe82c
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From d08ef863feae14e4710bf2026404e6c6e06db2be Mon Sep 17 00:00:00 2001
From: zhanchengbin <zhanchengbin1@huawei.com>
Date: Mon, 10 Oct 2022 16:56:58 +0800
Subject: [PATCH] misc/fsck.c: Processes may kill other processes.
I find a error in misc/fsck.c, if run the fsck -N command, processes
don't execute, just show what would be done. However, the pid whose
value is -1 is added to the instance_list list in the execute
function,if the kill_all function is called later, kill(-1, signum)
is executed, Signals are sent to all processes except the number one
process and itself. Other processes will be killed if they use the
default signal processing function.
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
misc/fsck.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/misc/fsck.c b/misc/fsck.c
index 1f6ec7d9..1769a106 100644
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -547,6 +547,8 @@ static int kill_all(int signum)
for (inst = instance_list; inst; inst = inst->next) {
if (inst->flags & FLAG_DONE)
continue;
+ if (inst->pid <= 0)
+ continue;
kill(inst->pid, signum);
n++;
}
--
2.38.1

View File

@ -1,6 +1,6 @@
Name: e2fsprogs
Version: 1.46.4
Release: 18
Release: 19
Summary: Second extended file system management tools
License: GPLv2+ and LGPLv2 and MIT
URL: http://e2fsprogs.sourceforge.net/
@ -32,6 +32,7 @@ Patch22: 0022-unix_io.c-fix-deadlock-problem-in-unix_write_blk64.patch
Patch23: 0023-debugfs-fix-repeated-output-problem-with-logdump-O-n.patch
Patch24: 0024-tune2fs-check-return-value-of-ext2fs_mmp_update2-in-.patch
Patch25: 0025-mmp-fix-wrong-comparison-in-ext2fs_mmp_stop.patch
Patch26: 0026-misc-fsck.c-Processes-may-kill-other-processes.patch
BuildRequires: gcc pkgconfig texinfo
@ -173,6 +174,9 @@ exit 0
%{_mandir}/man8/*
%changelog
* Thu Mar 30 2023 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 1.46.4-19
- backport one patch to fix: processes may kill other processes in misc/fsck.c
* Thu Feb 9 2023 lihaoxiang <lihaoxiang9@huawei.com> - 1.46.4-18
- Upstream patches regress for debugfs, tune2fs and mmp.