pkg/debian: Update Debian specific patches
This commit is contained in:
parent
297279e974
commit
c215d7036d
|
@ -1,8 +1,7 @@
|
|||
From daa418b418b849395ae6b5855c1a3fc5f027c563 Mon Sep 17 00:00:00 2001
|
||||
From 26b723079391b268d79612ae4bcca0a9e613ea9d 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
|
||||
Bug-Debian: https://bugs.debian.org/901492
|
||||
|
||||
We want to enable use of the Android ashmem and binder drivers to
|
||||
support Anbox, but they should not be built-in as that would waste
|
||||
|
@ -12,14 +11,13 @@ need them.
|
|||
Export the currently un-exported symbols they depend on.
|
||||
---
|
||||
fs/file.c | 1 +
|
||||
kernel/fork.c | 1 +
|
||||
kernel/sched/core.c | 1 +
|
||||
kernel/sched/wait.c | 1 +
|
||||
kernel/task_work.c | 1 +
|
||||
mm/memory.c | 1 +
|
||||
mm/shmem.c | 1 +
|
||||
security/security.c | 4 ++++
|
||||
8 files changed, 11 insertions(+)
|
||||
7 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/fs/file.c b/fs/file.c
|
||||
index 3bcc1ecc314a..6ff78a4c27a9 100644
|
||||
|
@ -33,18 +31,6 @@ index 3bcc1ecc314a..6ff78a4c27a9 100644
|
|||
|
||||
void do_close_on_exec(struct files_struct *files)
|
||||
{
|
||||
diff --git a/kernel/fork.c b/kernel/fork.c
|
||||
index 9d44f2d46c69..d587c85f35b1 100644
|
||||
--- a/kernel/fork.c
|
||||
+++ b/kernel/fork.c
|
||||
@@ -1225,6 +1225,7 @@ void mmput_async(struct mm_struct *mm)
|
||||
schedule_work(&mm->async_put_work);
|
||||
}
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(mmput_async);
|
||||
#endif
|
||||
|
||||
/**
|
||||
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
||||
index d4af56927a4d..ebff11e343fd 100644
|
||||
--- a/kernel/sched/core.c
|
||||
|
@ -94,10 +80,10 @@ index 1c6027adc542..75372d105b0e 100644
|
|||
/**
|
||||
* zap_page_range_single - remove user pages in a given range
|
||||
diff --git a/mm/shmem.c b/mm/shmem.c
|
||||
index b7f2d4a56867..3bf380f68406 100644
|
||||
index f152375e770b..ccc1633695fe 100644
|
||||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -4172,6 +4172,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
|
||||
@@ -4173,6 +4173,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -106,7 +92,7 @@ index b7f2d4a56867..3bf380f68406 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 188b8f782220..e5538a412f3c 100644
|
||||
index 8b62654ff3f9..67670e24fcbc 100644
|
||||
--- a/security/security.c
|
||||
+++ b/security/security.c
|
||||
@@ -752,24 +752,28 @@ int security_binder_set_context_mgr(const struct cred *mgr)
|
||||
|
@ -139,5 +125,5 @@ index 188b8f782220..e5538a412f3c 100644
|
|||
int security_ptrace_access_check(struct task_struct *child, unsigned int mode)
|
||||
{
|
||||
--
|
||||
2.37.2
|
||||
2.37.3
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 5b4a9bf506709048bdc7e34dfd45d77d12204088 Mon Sep 17 00:00:00 2001
|
||||
From 6c232a01f28a1dc9f69e14a9599a9c8ccebe7e28 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 26 Aug 2022 21:24:36 +0200
|
||||
Subject: [PATCH] Revert "integrity: Only use machine keyring when
|
||||
|
@ -98,5 +98,5 @@ index 7aaed7950b6e..09fd8f20c756 100644
|
|||
- return trust_mok;
|
||||
-}
|
||||
--
|
||||
2.37.2
|
||||
2.37.3
|
||||
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
From 2b9475905ae4e98cbbdf2734efee31d02995c895 Mon Sep 17 00:00:00 2001
|
||||
From 62fe4204b83f0694c83a9f2826fd5dfa0c3fcb18 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
|
||||
Bug-Debian: https://bugs.debian.org/901492
|
||||
|
||||
We want to enable use of the Android ashmem and binder drivers to
|
||||
support Anbox, but they should not be built-in as that would waste
|
||||
|
@ -55,7 +54,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 d044418294f9..65f1e03c1bfb 100644
|
||||
index 53797453a6ee..a1872c2be290 100644
|
||||
--- a/drivers/android/binder_alloc.c
|
||||
+++ b/drivers/android/binder_alloc.c
|
||||
@@ -38,7 +38,7 @@ enum {
|
||||
|
@ -68,5 +67,5 @@ index d044418294f9..65f1e03c1bfb 100644
|
|||
|
||||
#define binder_alloc_debug(mask, x...) \
|
||||
--
|
||||
2.37.2
|
||||
2.37.3
|
||||
|
||||
|
|
Loading…
Reference in a new issue