bughz
/
anbox-modules
mirror of https://github.com/choff/anbox-modules.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compilation fix for kernel 5.15.2 

Linux 5.15.2 updated security.h  security_binder_* functions (like security_binder_transfer_binder(), so it uses struct cred* instead of struct task_struct*)
This commit is contained in:
Dhiego Cassiano Fogaça Barbosa 2021-11-13 13:51:20 -03:00 committed by Christian Hoff
parent 516144c6a0
commit b0c3c5a7c9
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
binder/binder.c
View File

@ -2435,7 +2435,11 @@ static int binder_translate_binder(struct flat_binder_object *fp,
ret = -EINVAL; ret = -EINVAL;
goto done; goto done;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,2))
if (security_binder_transfer_binder(proc->tsk->real_cred, target_proc->tsk->real_cred)) {
#else
if (security_binder_transfer_binder(proc->tsk, target_proc->tsk)) { if (security_binder_transfer_binder(proc->tsk, target_proc->tsk)) {
#endif
ret = -EPERM; ret = -EPERM;
goto done; goto done;
} }
@ -2481,7 +2485,11 @@ static int binder_translate_handle(struct flat_binder_object *fp,
proc->pid, thread->pid, fp->handle); proc->pid, thread->pid, fp->handle);
return -EINVAL; return -EINVAL;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,2))
if (security_binder_transfer_binder(proc->tsk->real_cred, target_proc->tsk->real_cred)) {
#else
if (security_binder_transfer_binder(proc->tsk, target_proc->tsk)) { if (security_binder_transfer_binder(proc->tsk, target_proc->tsk)) {
#endif
ret = -EPERM; ret = -EPERM;
goto done; goto done;
} }
@ -2569,7 +2577,11 @@ static int binder_translate_fd(u32 fd, binder_size_t fd_offset,
ret = -EBADF; ret = -EBADF;
goto err_fget; goto err_fget;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,2))
ret = security_binder_transfer_file(proc->tsk->real_cred, target_proc->tsk->real_cred, file);
#else
ret = security_binder_transfer_file(proc->tsk, target_proc->tsk, file); ret = security_binder_transfer_file(proc->tsk, target_proc->tsk, file);
#endif
if (ret < 0) { if (ret < 0) {
ret = -EPERM; ret = -EPERM;
goto err_security; goto err_security;
@ -2967,8 +2979,13 @@ static void binder_transaction(struct binder_proc *proc,
return_error_line = __LINE__; return_error_line = __LINE__;
goto err_invalid_target_handle; goto err_invalid_target_handle;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,2))
if (security_binder_transaction(proc->tsk->real_cred,
target_proc->tsk->real_cred) < 0) {
#else
if (security_binder_transaction(proc->tsk, if (security_binder_transaction(proc->tsk,
target_proc->tsk) < 0) { target_proc->tsk) < 0) {
#endif
return_error = BR_FAILED_REPLY; return_error = BR_FAILED_REPLY;
return_error_param = -EPERM; return_error_param = -EPERM;
return_error_line = __LINE__; return_error_line = __LINE__;
@ -4910,7 +4927,11 @@ static int binder_ioctl_set_ctx_mgr(struct file *filp,
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,2))
ret = security_binder_set_context_mgr(proc->tsk->real_cred);
#else
ret = security_binder_set_context_mgr(proc->tsk); ret = security_binder_set_context_mgr(proc->tsk);
#endif
if (ret < 0) if (ret < 0)
goto out; goto out;
if (uid_valid(context->binder_context_mgr_uid)) { if (uid_valid(context->binder_context_mgr_uid)) {