pkd/debian: Update binder patches

pkg/debian/kernel/0001-Export-symbols-needed-by-Android-drivers.patch

@@ -1,4 +1,4 @@
-From 7f62394deb9ffe9dcb4bda81daf76f4d5a06733e Mon Sep 17 00:00:00 2001
+From 45a9ef422741bb90ef8c996cde2a5e960a71c6af Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben@decadent.org.uk>
 Date: Mon, 7 Sep 2020 02:51:53 +0100
 Subject: [PATCH 1/2] Export symbols needed by Android drivers
@@ -20,22 +20,22 @@ Export the currently un-exported symbols they depend on.
  7 files changed, 10 insertions(+)
 
 diff --git a/fs/file.c b/fs/file.c
-index dab120b71e44..66f7ae2125b2 100644
+index 86dc9956af32..3cc1867f289f 100644
 --- a/fs/file.c
 +++ b/fs/file.c
-@@ -761,6 +761,7 @@ int close_fd_get_file(unsigned int fd, struct file **res)
+@@ -771,6 +771,7 @@ int __close_fd_get_file(unsigned int fd, struct file **res)
  	*res = NULL;
  	return -ENOENT;
  }
 +EXPORT_SYMBOL(close_fd_get_file);
  
- void do_close_on_exec(struct files_struct *files)
- {
+ /*
+  * variant of close_fd that gets a ref on the file for later fput.
 diff --git a/kernel/fork.c b/kernel/fork.c
-index d66cd1014211..ff215b3fdb15 100644
+index 567fee340500..3d6ec900d9e4 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -1120,6 +1120,7 @@ void mmput_async(struct mm_struct *mm)
+@@ -1134,6 +1134,7 @@ void mmput_async(struct mm_struct *mm)
  		schedule_work(&mm->async_put_work);
  	}
  }
@@ -44,10 +44,10 @@ index d66cd1014211..ff215b3fdb15 100644
  
  /**
 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index ff74fca39ed2..943239122b29 100644
+index e5858999b54d..081aec8cf334 100644
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -5575,6 +5575,7 @@ int can_nice(const struct task_struct *p, const int nice)
+@@ -5774,6 +5774,7 @@ int can_nice(const struct task_struct *p, const int nice)
  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
  }
@@ -56,34 +56,34 @@ index ff74fca39ed2..943239122b29 100644
  #ifdef __ARCH_WANT_SYS_NICE
  
 diff --git a/kernel/task_work.c b/kernel/task_work.c
-index 9cde961875c0..5c8dea45d4f8 100644
+index 1698fbe6f0e1..90000404af2b 100644
 --- a/kernel/task_work.c
 +++ b/kernel/task_work.c
-@@ -57,6 +57,7 @@ int task_work_add(struct task_struct *task, struct callback_head *work,
+@@ -60,6 +60,7 @@ int task_work_add(struct task_struct *task, struct callback_head *work,
  
  	return 0;
  }
 +EXPORT_SYMBOL(task_work_add);
  
  /**
-  * task_work_cancel - cancel a pending work added by task_work_add()
+  * task_work_cancel_match - cancel a pending work added by task_work_add()
 diff --git a/mm/memory.c b/mm/memory.c
-index feff48e1465a..9e9b0fd92e38 100644
+index b15367c285bd..f2ae359139dd 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -1542,6 +1542,7 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start,
+@@ -1559,6 +1559,7 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start,
  	mmu_notifier_invalidate_range_end(&range);
- 	tlb_finish_mmu(&tlb, start, range.end);
+ 	tlb_finish_mmu(&tlb);
  }
 +EXPORT_SYMBOL_GPL(zap_page_range);
  
  /**
   * zap_page_range_single - remove user pages in a given range
 diff --git a/mm/shmem.c b/mm/shmem.c
-index 7c6b6d8f6c39..83151e1345e6 100644
+index 5fa21d66af20..72e256e65877 100644
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
-@@ -4287,6 +4287,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
+@@ -4243,6 +4243,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
  
  	return 0;
  }
@@ -92,10 +92,10 @@ index 7c6b6d8f6c39..83151e1345e6 100644
  /**
   * shmem_read_mapping_page_gfp - read into page cache, using specified page allocation flags.
 diff --git a/security/security.c b/security/security.c
-index 7b09cfbae94f..5eaec62c51f2 100644
+index b38155b2de83..38fb6a2ce080 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -727,24 +727,28 @@ int security_binder_set_context_mgr(struct task_struct *mgr)
+@@ -750,24 +750,28 @@ int security_binder_set_context_mgr(struct task_struct *mgr)
  {
  	return call_int_hook(binder_set_context_mgr, 0, mgr);
  }
@@ -125,5 +125,5 @@ index 7b09cfbae94f..5eaec62c51f2 100644
  int security_ptrace_access_check(struct task_struct *child, unsigned int mode)
  {
 -- 
-2.30.1
+2.32.0
 

pkg/debian/kernel/0002-android-Enable-building-ashmem-and-binder-as-modules.patch

@@ -1,4 +1,4 @@
-From a005d7a334256bdf252a39897429e952f24dfe9a Mon Sep 17 00:00:00 2001
+From 4812d6aec2f180781773a21ff05c1baf48b2ca13 Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben@decadent.org.uk>
 Date: Fri, 22 Jun 2018 17:27:00 +0100
 Subject: [PATCH 2/2] android: Enable building ashmem and binder as modules
@@ -50,7 +50,7 @@ index c9d3d0c99c25..55411d9a9c2a 100644
 +binder_linux-$(CONFIG_ANDROID_BINDERFS)	+= binderfs.o
 +binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
 diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
-index 7caf74ad2405..9202a44bd55d 100644
+index 340515f54498..9ad2387688de 100644
 --- a/drivers/android/binder_alloc.c
 +++ b/drivers/android/binder_alloc.c
 @@ -38,7 +38,7 @@ enum {
@@ -87,7 +87,7 @@ index e9a55a5e6529..60cb8eacc793 100644
 +obj-$(CONFIG_ASHMEM)			+= ashmem_linux.o
 +ashmem_linux-y				+= ashmem.o
 diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
-index 4789d36ddfd3..f86efd3da373 100644
+index d66a64e42273..2a22977430f8 100644
 --- a/drivers/staging/android/ashmem.c
 +++ b/drivers/staging/android/ashmem.c
 @@ -24,6 +24,7 @@
@@ -105,5 +105,5 @@ index 4789d36ddfd3..f86efd3da373 100644
 +
 +MODULE_LICENSE("GPL v2");
 -- 
-2.30.1
+2.32.0