bughz/anbox-modules
1
0
Fork 0
mirror of https://github.com/choff/anbox-modules.git synced 2025-04-14 00:03:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for kernel 6.13+

Browse Source
This commit is contained in:
llyyr 2025-03-05 04:53:49 +05:30
parent ee4c25f064
commit d2f89a2b8a
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binder/binder.c
View File

@ -3128,7 +3128,9 @@ static void binder_transaction(struct binder_proc *proc,
u32 secid; u32 secid;
size_t added_size; size_t added_size;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0)
security_cred_getsecid(proc->cred, &secid);
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0)
security_task_getsecid_obj(proc->tsk, &secid); security_task_getsecid_obj(proc->tsk, &secid);
#else #else
security_task_getsecid(proc->tsk, &secid); security_task_getsecid(proc->tsk, &secid);

13
binder/binder_alloc.c
View File

@ -1055,6 +1055,13 @@ err_get_alloc_mutex_failed:
return LRU_SKIP; return LRU_SKIP;
} }
enum lru_status binder_alloc_free_page_no_lock(struct list_head *item,
struct list_lru_one *lru,
void *cb_arg)
{
return binder_alloc_free_page(item, lru, NULL, cb_arg);
}
static unsigned long static unsigned long
binder_shrink_count(struct shrinker *shrink, struct shrink_control *sc) binder_shrink_count(struct shrinker *shrink, struct shrink_control *sc)
{ {
@ -1066,9 +1073,13 @@ static unsigned long
binder_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) binder_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
{ {
unsigned long ret; unsigned long ret;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0))
ret = list_lru_walk(&binder_alloc_lru, binder_alloc_free_page_no_lock,
NULL, sc->nr_to_scan);
#else
ret = list_lru_walk(&binder_alloc_lru, binder_alloc_free_page, ret = list_lru_walk(&binder_alloc_lru, binder_alloc_free_page,
NULL, sc->nr_to_scan); NULL, sc->nr_to_scan);
#endif
return ret; return ret;
} }

2
binder/binder_alloc.h
View File

@ -117,6 +117,8 @@ static inline void binder_selftest_alloc(struct binder_alloc *alloc) {}
enum lru_status binder_alloc_free_page(struct list_head *item, enum lru_status binder_alloc_free_page(struct list_head *item,
struct list_lru_one *lru, struct list_lru_one *lru,
spinlock_t *lock, void *cb_arg); spinlock_t *lock, void *cb_arg);
enum lru_status binder_alloc_free_page_no_lock(struct list_head *item,
struct list_lru_one *lru, void *cb_arg);
extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc, extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc,
size_t data_size, size_t data_size,
size_t offsets_size, size_t offsets_size,