From 647d0bdb7dc998f8fa893850a3c481a5cce43192 Mon Sep 17 00:00:00 2001 From: xiongchangwu Date: Sat, 22 Jun 2024 17:03:54 +0800 Subject: [PATCH 1/3] dlopen libpath modify Signed-off-by: xiongchangwu --- adapter/uhdf2/host/src/driver_loader_full.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter/uhdf2/host/src/driver_loader_full.c b/adapter/uhdf2/host/src/driver_loader_full.c index 6632c4bb2..ed1006af3 100644 --- a/adapter/uhdf2/host/src/driver_loader_full.c +++ b/adapter/uhdf2/host/src/driver_loader_full.c @@ -61,7 +61,7 @@ struct HdfDriver *HdfDriverLoaderGetDriver(const char *moduleName) return NULL; } - void *handle = dlopen(realPath, RTLD_LAZY); + void *handle = dlopen(moduleName, RTLD_LAZY); if (handle == NULL) { HDF_LOGE("get driver entry failed, %{public}s load fail, %{public}s", realPath, dlerror()); OsalMemFree(driver); -- Gitee From 473ea7a27ef7946467d2888b98a3eef5d2c42a68 Mon Sep 17 00:00:00 2001 From: xiongchangwu Date: Mon, 24 Jun 2024 09:27:23 +0800 Subject: [PATCH 2/3] change adapter codeowner Signed-off-by: xiongchangwu --- .gitee/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitee/CODEOWNERS b/.gitee/CODEOWNERS index 1110287e6..c5732e4a0 100644 --- a/.gitee/CODEOWNERS +++ b/.gitee/CODEOWNERS @@ -13,8 +13,8 @@ * limitations under the License. */ -adapter/ @time_zhang -framework/ @time_zhang +adapter/ @Danny_liuXu +framework/ @Danny_liuXu framework/model/input/ @time_zhang framework/model/audio/ @whoselettlelion framework/include/audio/ @whoselettlelion -- Gitee From d2054772d5d2410081d297d364c0d71b610c3b29 Mon Sep 17 00:00:00 2001 From: xiongchangwu Date: Mon, 24 Jun 2024 09:39:57 +0800 Subject: [PATCH 3/3] del devmgr CAP_SYS_MODULE Signed-off-by: xiongchangwu --- adapter/uhdf2/manager/hdf_devmgr.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adapter/uhdf2/manager/hdf_devmgr.cfg b/adapter/uhdf2/manager/hdf_devmgr.cfg index 5e54e2e32..c8493f78a 100644 --- a/adapter/uhdf2/manager/hdf_devmgr.cfg +++ b/adapter/uhdf2/manager/hdf_devmgr.cfg @@ -5,8 +5,7 @@ "uid" : "hdf_devmgr", "gid" : ["hdf_devmgr", "readproc", "uhdf_driver"], "start-mode" : "boot", - "secon" : "u:r:hdf_devmgr:s0", - "caps" : ["CAP_SYS_MODULE"] + "secon" : "u:r:hdf_devmgr:s0" } ] } -- Gitee