Patches for kernel 5.19

[Thesola10]

This update reflects the signature change in close_fd_get_file_ptr from int close_fd_get_file_ptr(unsigned int fd, struct file **res) to struct file *close_fd_get_file_ptr(unsigned int fd).

[Etaash-mathamsetty]

check here if you want to make it a bit easier on yourself: https://github.com/torvalds/linux/blob/master/drivers/android/binder.c

[Thesola10]

that's what I meant by "cross-referencing with the in-tree version". My changes should reflect those in the mainline kernel, save for the versioning macros...

[Thesola10]

Okay, I think it may have been the return parameter on the dynamic func pointer that was still using an int return type, truncating the pointer on 64-bit and leading to segfault, mb

[Thesola10]

nvm it works!!!

[jingxu9x]

I have test a patch, which works well. patch file as follow

--- /usr/src/anbox-binder-r38.8148a16/deps.c	2022-07-04 00:18:45.000000000 +0800
+++ deps.c	2022-08-21 01:19:24.013614356 +0800
@@ -69,7 +69,16 @@ static unsigned long kallsyms_lookup_nam
 #endif
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0))
+static struct file *(*close_fd_get_file_ptr)(unsigned int fd) = NULL;
 
+struct file * close_fd_get_file(unsigned int fd)
+{
+	if (!close_fd_get_file_ptr)
+		close_fd_get_file_ptr = kallsyms_lookup_name_wrapper("close_fd_get_file");
+	return close_fd_get_file_ptr(fd);
+}
+#else
 static int (*close_fd_get_file_ptr)(unsigned int fd, struct file **res) = NULL;
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0))
@@ -86,6 +95,7 @@ int __close_fd_get_file(unsigned int fd,
 #endif
 	return close_fd_get_file_ptr(fd, res);
 }
+#endif
 
 static int (*can_nice_ptr)(const struct task_struct *, const int) = NULL;
 
--- /usr/src/anbox-binder-r38.8148a16/binder.c	2022-07-04 00:18:45.000000000 +0800
+++ binder.c	2022-08-22 01:15:31.871108563 +0800
@@ -2236,12 +2236,17 @@ static void binder_deferred_fd_close(int
 	if (!twcb)
 		return;
 	init_task_work(&twcb->twork, binder_do_fd_close);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0))
+	twcb->file = close_fd_get_file(fd);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0))
 	close_fd_get_file(fd, &twcb->file);
 #else
 	__close_fd_get_file(fd, &twcb->file);
 #endif
 	if (twcb->file) {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0))
+		get_file(twcb->file);
+#endif
 		filp_close(twcb->file, current->files);
 		task_work_add(current, &twcb->twork, TWA_RESUME);
 	} else {

hope it will help you! ^-^

[Thesola10]

Thanks but I already got it working!

[gholmann16]

Currently not working on 5.19 so I hope this fixes it! I'm just waiting for it to be approved.

[Etaash-mathamsetty]

maybe his notification settings are still bad, so let me try pinging him
@choff

[choff]

Hello all,

actually, I was able to fix my notification settings :-) ..

Thanks a lot for all your contributions that make everything work with newer kernels. I will review also this patch, but as I am about to travel, I need to ask for another 1-2 weeks of patience. Then, I will be able to review it.

Best regards,

Christian

[ricklambrechts]

Thanks! This works!

[choff]

Thank you very much, @Thesola10 for your contribution for kernel 5.19 support! I have merged your PR now. I want to apologize for the long review period - unfortunately, I have been very busy during the last weeks :-(