android: Enable building ashmem and binder as modules

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
resources and increase security attack surface on systems that don't
need them.

- Add a MODULE_LICENSE declaration to ashmem
- Change the Makefiles to build each driver as an object with the
  "_linux" suffix (which is what Anbox expects)
- Change config symbol types to tristate

Gbp-Pq: Topic debian
Gbp-Pq: Name android-enable-building-ashmem-and-binder-as-modules.patch

diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index ee4880bfdcdc98d21f139bdce51bb5776f3f17ab..f87c09b753a890c3cf9f4b7fa2d0407bf75f2aa0 100644 (file)
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -9,7 +9,7 @@ config ANDROID
 if ANDROID
 
 config ANDROID_BINDER_IPC
-       bool "Android Binder IPC Driver"
+       tristate "Android Binder IPC Driver"
        depends on MMU && !M68K
        default n
        ---help---

diff --git a/drivers/android/Makefile b/drivers/android/Makefile
index a01254c43ee3f714020aff487314f32ec0b2bbde..e42257997ba8c4f2f69a51b0ea19c07d285e1f1f 100644 (file)
--- a/drivers/android/Makefile
+++ b/drivers/android/Makefile
@@ -1,4 +1,5 @@
 ccflags-y += -I$(src)                  # needed for trace events
 
-obj-$(CONFIG_ANDROID_BINDER_IPC)       += binder.o binder_alloc.o
-obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
+obj-$(CONFIG_ANDROID_BINDER_IPC)       += binder_linux.o
+binder_linux-y := binder.o binder_alloc.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 3d5277a39097ca4f015855f6db564141dfebef71..0767341b5d66f42527363ec14dbd8ae1dca535a2 100644 (file)
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -42,7 +42,7 @@ enum {
 };
 static uint32_t binder_alloc_debug_mask;
 
-module_param_named(debug_mask, binder_alloc_debug_mask,
+module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
                   uint, 0644);
 
 #define binder_alloc_debug(mask, x...) \

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index 17c5587805f54eed328bf7b3246939c73735c620..c46669f32bfa40faddb0273669f951fb147aa51c 100644 (file)
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -3,7 +3,7 @@ menu "Android"
 if ANDROID
 
 config ASHMEM
-       bool "Enable the Anonymous Shared Memory Subsystem"
+       tristate "Enable the Anonymous Shared Memory Subsystem"
        default n
        depends on SHMEM
        help

diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index 90e6154f11a4cda073c5a6f69944d231361270be..8202002bd72cbec1d88a6b8bc4916e352d00da9c 100644 (file)
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -2,5 +2,6 @@ ccflags-y += -I$(src)                   # needed for trace events
 
 obj-y                                  += ion/
 
-obj-$(CONFIG_ASHMEM)                   += ashmem.o
+obj-$(CONFIG_ASHMEM)                   += ashmem_linux.o
+ashmem_linux-y += ashmem.o
 obj-$(CONFIG_ANDROID_VSOC)             += vsoc.o

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index d5d33e12e9529288876dd56950f751116cf6dd98..935ea9a5dee50178b8bd20d2ecb54a712c8443b9 100644 (file)
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
 #include <linux/shmem_fs.h>
+#include <linux/module.h>
 #include "ashmem.h"
 
 #define ASHMEM_NAME_PREFIX "dev/ashmem/"
@@ -897,3 +898,5 @@ out:
        return ret;
 }
 device_initcall(ashmem_init);
+
+MODULE_LICENSE("GPL v2");