298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

procd: ujail upgrade patch for latest version (#10384)

Browse Source 
Fix: #10382
This commit is contained in:
ty 2022-11-07 13:28:55 +08:00 committed by GitHub
parent 3ff8b3e253
commit 39ed1b72cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/system/procd/Makefile
View File

@ -68,7 +68,7 @@ define Package/procd-ujail
SECTION:=base SECTION:=base
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=@KERNEL_NAMESPACES +@KERNEL_UTS_NS +@KERNEL_IPC_NS +@KERNEL_PID_NS \ DEPENDS:=@KERNEL_NAMESPACES +@KERNEL_UTS_NS +@KERNEL_IPC_NS +@KERNEL_PID_NS \
+libubox +libubus +libblobmsg-json +libubox +libubus +libuci +libblobmsg-json
TITLE:=OpenWrt process jail helper TITLE:=OpenWrt process jail helper
endef endef

14
package/system/procd/patches/001-procd_ujail_static_binary_fix.patch
View File

@ -1,16 +1,16 @@
--- a/jail/elf.c --- a/jail/elf.c
+++ b/jail/elf.c +++ b/jail/elf.c
@@ -240,18 +240,18 @@ int elf_load_deps(const char *path, cons @@ -236,18 +236,18 @@ int elf_load_deps(const char *path, cons
unsigned long load_offset, load_vaddr;
gcc_mips64_bug_work_around = 1; unsigned long interp_offset;
#endif
- if (elf_find_section(map, PT_LOAD, &load_offset, NULL, &load_vaddr)) { - if (elf_find_section(map, PT_LOAD, &load_offset, NULL, &load_vaddr)) {
- ERROR("failed to load the .load section from %s\n", path); - ERROR("failed to load the .load section from %s\n", path);
- return -1; - return -1;
+ if (elf_find_section(map, PT_INTERP, &interp_offset, NULL, NULL) == 0) { + if (elf_find_section(map, PT_INTERP, &interp_offset, NULL, NULL) == 0) {
+ add_path_and_deps(map+interp_offset, 1, -1, 0); + add_path_and_deps(map+interp_offset, 1, -1, 0);
} }
- if (elf_find_section(map, PT_DYNAMIC, &dyn_offset, &dyn_size, NULL)) { - if (elf_find_section(map, PT_DYNAMIC, &dyn_offset, &dyn_size, NULL)) {
- ERROR("failed to load the .dynamic section from %s\n", path); - ERROR("failed to load the .dynamic section from %s\n", path);
- return -1; - return -1;
@ -18,12 +18,12 @@
+ DEBUG("failed to load the .load section from %s\n", path); + DEBUG("failed to load the .load section from %s\n", path);
+ return 0; + return 0;
} }
- if (elf_find_section(map, PT_INTERP, &interp_offset, NULL, NULL) == 0) { - if (elf_find_section(map, PT_INTERP, &interp_offset, NULL, NULL) == 0) {
- add_path_and_deps(map+interp_offset, 1, -1, 0); - add_path_and_deps(map+interp_offset, 1, -1, 0);
+ if (elf_find_section(map, PT_DYNAMIC, &dyn_offset, &dyn_size, NULL)) { + if (elf_find_section(map, PT_DYNAMIC, &dyn_offset, &dyn_size, NULL)) {
+ DEBUG("failed to load the .dynamic section from %s\n", path); + DEBUG("failed to load the .dynamic section from %s\n", path);
+ return 0; + return 0;
} }
int clazz = map[EI_CLASS]; int clazz = map[EI_CLASS];