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 53a34ac5f9819120c48b3057cc9e56f16ce5aa4e)
This commit is contained in:
parent
21a2bba262
commit
519cd9bae9
39
0051-misc-fsck.c-Processes-may-kill-other-processes.patch
Normal file
39
0051-misc-fsck.c-Processes-may-kill-other-processes.patch
Normal 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
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: e2fsprogs
|
Name: e2fsprogs
|
||||||
Version: 1.45.6
|
Version: 1.45.6
|
||||||
Release: 15
|
Release: 16
|
||||||
Summary: Second extended file system management tools
|
Summary: Second extended file system management tools
|
||||||
License: GPLv2 and LGPLv2 and GPLv2+
|
License: GPLv2 and LGPLv2 and GPLv2+
|
||||||
URL: http://e2fsprogs.sourceforge.net/
|
URL: http://e2fsprogs.sourceforge.net/
|
||||||
@ -57,6 +57,7 @@ Patch47: 0047-tune2fs-tune2fs_main-should-return-rc-when-some-erro.patch
|
|||||||
Patch48: 0048-tune2fs-exit-directly-when-fs-freed-in-ext2fs_run_ext3_journal.patch
|
Patch48: 0048-tune2fs-exit-directly-when-fs-freed-in-ext2fs_run_ext3_journal.patch
|
||||||
Patch49: 0049-debugfs-fix-repeated-output-problem-with-logdump-O-n.patch
|
Patch49: 0049-debugfs-fix-repeated-output-problem-with-logdump-O-n.patch
|
||||||
Patch50: 0050-mmp-fix-wrong-comparison-in-ext2fs_mmp_stop.patch
|
Patch50: 0050-mmp-fix-wrong-comparison-in-ext2fs_mmp_stop.patch
|
||||||
|
Patch51: 0051-misc-fsck.c-Processes-may-kill-other-processes.patch
|
||||||
|
|
||||||
BuildRequires: gcc pkgconfig texinfo
|
BuildRequires: gcc pkgconfig texinfo
|
||||||
BuildRequires: fuse-devel libblkid-devel libuuid-devel
|
BuildRequires: fuse-devel libblkid-devel libuuid-devel
|
||||||
@ -178,6 +179,9 @@ exit 0
|
|||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 30 2023 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 1.46.6-16
|
||||||
|
- backport one patch to fix: processes may kill other processes in misc/fsck.c
|
||||||
|
|
||||||
* Thu Feb 9 2023 lihaoxiang <lihaoxiang9@huawei.com> - 1.45.6-15
|
* Thu Feb 9 2023 lihaoxiang <lihaoxiang9@huawei.com> - 1.45.6-15
|
||||||
- Upstream patches regress for debugfs, tune2fs and mmp.
|
- Upstream patches regress for debugfs, tune2fs and mmp.
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user