android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/ShirkNeko/SukiSU-Ultra into dev

Browse Source
This commit is contained in:
ShirkNeko
2025-03-30 18:31:09 +08:00
parent 57c8d69e83 79c0bebcf5
commit e24588b961
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/kpm/kpm.c
View File

@@ -299,6 +299,13 @@ static long kpm_get_offset(struct kpm_module *mod, unsigned int *size, Elf64_Shd
return ret; return ret;
} }
static long kpm_get_offset2(struct module *mod, unsigned int *size, Elf_Shdr *sechdr, unsigned int section)
{
long ret = ALIGN(*size, sechdr->sh_addralign ?: 1);
*size = ret + sechdr->sh_size;
return ret;
}
/*static void kpm_layout_sections(struct kpm_module *mod, struct kpm_load_info *info) /*static void kpm_layout_sections(struct kpm_module *mod, struct kpm_load_info *info)
{ {
int i; int i;
@@ -321,7 +328,7 @@ static long kpm_get_offset(struct kpm_module *mod, unsigned int *size, Elf64_Shd
#ifndef align #ifndef align
#define KP_ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask)) #define KP_ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask))
#define KP_ALIGN(x, a) ALIGN_MASK(x, (typeof(x))(a)-1) #define KP_ALIGN(x, a) KP_ALIGN_MASK(x, (typeof(x))(a)-1)
#define kp_align(X) KP_ALIGN(X, page_size) #define kp_align(X) KP_ALIGN(X, page_size)
#endif #endif
@@ -345,7 +352,7 @@ static void kpm_layout_sections(struct kpm_module *mod, struct kpm_load_info *in
Elf_Shdr *s = &info->sechdrs[i]; Elf_Shdr *s = &info->sechdrs[i];
if ((s->sh_flags & masks[m][0]) != masks[m][0] || (s->sh_flags & masks[m][1]) || s->sh_entsize != ~0UL) if ((s->sh_flags & masks[m][0]) != masks[m][0] || (s->sh_flags & masks[m][1]) || s->sh_entsize != ~0UL)
continue; continue;
s->sh_entsize = kpm_get_offset(mod, &mod->size, s, i); s->sh_entsize = kpm_get_offset2(mod, &mod->size, s, i);
// const char *sname = info->secstrings + s->sh_name; // const char *sname = info->secstrings + s->sh_name;
} }
switch (m) { switch (m) {