From 86f12f369b753a323293a33346ce692bb684203d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=BA=9E=E6=BA=90?= <14777372+yang-pangyuan@user.noreply.gitee.com> Date: Wed, 28 May 2025 10:22:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Description:=20kernel=5Fliteos=5Fa=20kill?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=AB=9E=E4=BA=89=E6=BC=8F=E6=B4=9E=20IssueN?= =?UTF-8?q?o:=20https://gitee.com/yang-pangyuan/kernel=5Fliteos=5Fa/issues?= =?UTF-8?q?/ICB1OD=20Feature=20or=20Bugfix:=20Bugfix=20Binary=20Source:=20?= =?UTF-8?q?No=20Signed-off-by:=20yang-pangyuan@user.noreply.gitee.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/base/misc/kill_shellcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/base/misc/kill_shellcmd.c b/kernel/base/misc/kill_shellcmd.c index e21dca7d..c7cf0cac 100644 --- a/kernel/base/misc/kill_shellcmd.c +++ b/kernel/base/misc/kill_shellcmd.c @@ -74,7 +74,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdKill(INT32 argc, const CHAR **argv) goto ERROR; } - ret = OsKill(pidNo, abs(sigNo), OS_USER_KILL_PERMISSION); + ret = OsKillLock(pidNo, abs(sigNo)); HILOG_INFO(LOG_CORE, "Send signal(%d) to pidNo = %d!\n", abs(sigNo), pidNo); if (ret == -1) { HILOG_ERROR(LOG_CORE, "Kill fail ret = %d! Operation not permitted\n", ret); -- Gitee From 18fff30de4565f5fa420472a2951bd142690d58f Mon Sep 17 00:00:00 2001 From: y30015170 <1169998606@qq.com> Date: Wed, 28 May 2025 10:55:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Description:=20kernel=5Fliteos=5Fa=20kill?= =?UTF-8?q?=C3=8C=C2=BC=C3=BE=C2=BE=C2=BA=C3=95=C2=A9=C2=B6=C2=B4=20IssueN?= =?UTF-8?q?o:=20https://gitee.com/yang-pangyuan/kernel=5Fliteos=5Fa/issues?= =?UTF-8?q?/ICB1OD=20Feature=20or=20Bugfix:=20Bugfix=20Binary=20Source:=20?= =?UTF-8?q?No=20Signed-off-by:=201169998606@qq.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/base/misc/kill_shellcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/base/misc/kill_shellcmd.c b/kernel/base/misc/kill_shellcmd.c index e21dca7d..c7cf0cac 100644 --- a/kernel/base/misc/kill_shellcmd.c +++ b/kernel/base/misc/kill_shellcmd.c @@ -74,7 +74,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdKill(INT32 argc, const CHAR **argv) goto ERROR; } - ret = OsKill(pidNo, abs(sigNo), OS_USER_KILL_PERMISSION); + ret = OsKillLock(pidNo, abs(sigNo)); HILOG_INFO(LOG_CORE, "Send signal(%d) to pidNo = %d!\n", abs(sigNo), pidNo); if (ret == -1) { HILOG_ERROR(LOG_CORE, "Kill fail ret = %d! Operation not permitted\n", ret); -- Gitee From 9bc830d3032104502d5d6bcb71d47acb607ad092 Mon Sep 17 00:00:00 2001 From: y30015170 <1169998606@qq.com> Date: Wed, 28 May 2025 11:05:24 +0800 Subject: [PATCH 3/3] Description: kernel_liteos_a kill RaceConditions Bug IssueNo: https://gitee.com/yang-pangyuan/kernel_liteos_a/issues/ICB1OD Feature or Bugfix: Bugfix Binary Source: No Signed-off-by: y30015170 <1169998606@qq.com> --- kernel/base/misc/kill_shellcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/base/misc/kill_shellcmd.c b/kernel/base/misc/kill_shellcmd.c index e21dca7d..c7cf0cac 100644 --- a/kernel/base/misc/kill_shellcmd.c +++ b/kernel/base/misc/kill_shellcmd.c @@ -74,7 +74,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdKill(INT32 argc, const CHAR **argv) goto ERROR; } - ret = OsKill(pidNo, abs(sigNo), OS_USER_KILL_PERMISSION); + ret = OsKillLock(pidNo, abs(sigNo)); HILOG_INFO(LOG_CORE, "Send signal(%d) to pidNo = %d!\n", abs(sigNo), pidNo); if (ret == -1) { HILOG_ERROR(LOG_CORE, "Kill fail ret = %d! Operation not permitted\n", ret); -- Gitee