From 1064329c3ade10606b52f1dd2fe97c4755f9179e Mon Sep 17 00:00:00 2001 From: hw_llm Date: Thu, 15 Aug 2024 09:37:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?cherry=20pick=20d958a85=20from=20https://gi?= =?UTF-8?q?tee.com/hw=5Fllm/kernel=5Fliteos=5Fa/pulls/1202=20Description:?= =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E5=AE=B9=E5=99=A8=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=20IssueNo:=20https://gitee?= =?UTF-8?q?.com/openharmony/kernel=5Fliteos=5Fa/issues/I9TEYD=20Feature=20?= =?UTF-8?q?Or=20Bugfix:=20Bugfix=20Binary=20Source:=20No=20Signed-off-by:?= =?UTF-8?q?=20hw=5Fllm=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/extended/plimit/los_devicelimit.c | 2 +- tools/build/mk/los_config.mk | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/extended/plimit/los_devicelimit.c b/kernel/extended/plimit/los_devicelimit.c index a4a6446e..61f8e4ea 100644 --- a/kernel/extended/plimit/los_devicelimit.c +++ b/kernel/extended/plimit/los_devicelimit.c @@ -488,7 +488,7 @@ UINT32 OsDevLimitWriteDeny(ProcLimitSet *plimit, const CHAR *buf, UINT32 size) STATIC VOID DevLimitItemSetAccess(CHAR *acc, INT16 access) { INT32 index = 0; - (VOID)memset_s(acc, ACCLEN, 0, ACCLEN); + (VOID)memset_s(accArray, ACCLEN, 0, ACCLEN); if (access & DEVLIMIT_ACC_READ) { acc[index++] = 'r'; } diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index 2627bcc9..4a8e1782 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -124,6 +124,11 @@ LITEOS_BASELIB += -lcommon LIB_SUBDIRS += kernel/common LITEOS_KERNEL_INCLUDE += -I $(LITEOSTOPDIR)/kernel/common +ifeq ($(LOSCFG_KERNEL_CONTAINER), y) + LITEOS_BASELIB += -lcontainer + LIB_SUBDIRS += kernel/extended/container +endif + ifeq ($(LOSCFG_KERNEL_CPPSUPPORT), y) LITEOS_BASELIB += -lcppsupport LIB_SUBDIRS += kernel/extended/cppsupport From 37d08b1d1482c54bfb239c31933be0a96680a528 Mon Sep 17 00:00:00 2001 From: hw_llm Date: Fri, 16 Aug 2024 01:10:22 +0000 Subject: [PATCH 2/2] update kernel/extended/plimit/los_devicelimit.c. Signed-off-by: hw_llm --- kernel/extended/plimit/los_devicelimit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/extended/plimit/los_devicelimit.c b/kernel/extended/plimit/los_devicelimit.c index 61f8e4ea..a4a6446e 100644 --- a/kernel/extended/plimit/los_devicelimit.c +++ b/kernel/extended/plimit/los_devicelimit.c @@ -488,7 +488,7 @@ UINT32 OsDevLimitWriteDeny(ProcLimitSet *plimit, const CHAR *buf, UINT32 size) STATIC VOID DevLimitItemSetAccess(CHAR *acc, INT16 access) { INT32 index = 0; - (VOID)memset_s(accArray, ACCLEN, 0, ACCLEN); + (VOID)memset_s(acc, ACCLEN, 0, ACCLEN); if (access & DEVLIMIT_ACC_READ) { acc[index++] = 'r'; }