Skip to contentSkip to conversation

binderfs: respect limit on binder control creation

PATCH In review Christian Brauner 2 participants 6 messages Jan 23, 2019 – Jan 31, 2019 Android drivers

lore
Share & tools
lore

Christian Brauner

author maintainer
#0 lore raw

PATCH 1/2 binderfs: respect limit on binder control creation

We currently adhere to the reserved devices limit when creating new binderfs devices in binderfs instances not located in the inital ipc namespace. But it is still possible to rob the host instances of their 4 reserved devices by creating the maximum allowed number of devices in a single binderfs instance located in a non-initial ipc namespace and then mounting 4 separate binderfs instances in non-initial ipc namespaces. That happens because the limit is currently not respected for the creation of the initial binder-control device node. Block this nonsense by performing the same check in binderfs_binder_ctl_create() that we perform in binderfs_binder_device_create().

Fixes 36bdf3cae09d ("binderfs: reserve devices for initial mount")
---
 drivers/android/binderfs.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/android/binderfs.c +9 -1
index 6a2185eb66c5..7a550104a722 100644
@@ -395,6 +395,11 @@ static int binderfs_binder_ctl_create(struct super_block *sb)
 	struct inode *inode = NULL;
 	struct dentry *root = sb->s_root;
 	struct binderfs_info *info = sb->s_fs_info;
+#if defined(CONFIG_IPC_NS)
+	bool use_reserve = (info->ipc_ns == &init_ipc_ns);
+#else
+	bool use_reserve = true;
+#endif
 
 	device = kzalloc(sizeof(*device), GFP_KERNEL);
 	if (!device)
@@ -413,7 +418,10 @@ static int binderfs_binder_ctl_create(struct super_block *sb)
 
 	/* Reserve a new minor number for the new device. */
 	mutex_lock(&binderfs_minors_mutex);
-	minor = ida_alloc_max(&binderfs_minors, BINDERFS_MAX_MINOR, GFP_KERNEL);
+	minor = ida_alloc_max(&binderfs_minors,
+			      use_reserve ? BINDERFS_MAX_MINOR :
+					    BINDERFS_MAX_MINOR_CAPPED,
+			      GFP_KERNEL);
 	mutex_unlock(&binderfs_minors_mutex);
 	if (minor < 0) {
 		ret = minor;
Signature · 1 line
2.20.1
author maintainer
#1 lore raw

PATCH 2/2 binderfs: remove separate device_initcall()

binderfs should not have a separate device_initcall(). When a kernel is compiled with CONFIG_ANDROID_BINDERFS register the filesystem alongside CONFIG_ANDROID_IPC. This use-case is especially sensible when users specify CONFIG_ANDROID_IPC=y, CONFIG_ANDROID_BINDERFS=y and ANDROID_BINDER_DEVICES="".
When CONFIG_ANDROID_BINDERFS=n then this always succeeds so there's no regression potential for legacy workloads.

---
 drivers/android/binder.c          | 4 ++++
 drivers/android/binder_internal.h | 9 +++++++++
 drivers/android/binderfs.c        | 4 +---
 3 files changed, 14 insertions(+), 3 deletions(-)
drivers/android/binder.c +4 -0
index cdfc87629efb..751d76173f81 100644
@@ -5915,6 +5915,10 @@ static int __init binder_init(void)
 			goto err_init_binder_device_failed;
 	}
 
+	ret = init_binderfs();
+	if (ret)
+		goto err_init_binder_device_failed;
+
 	return ret;
 
 err_init_binder_device_failed:
drivers/android/binder_internal.h +9 -0
index 7fb97f503ef2..045b3e42d98b 100644
@@ -46,4 +46,13 @@ static inline bool is_binderfs_device(const struct inode *inode)
 }
 #endif
 
+#ifdef CONFIG_ANDROID_BINDERFS
+extern int __init init_binderfs(void);
+#else
+static inline int __init init_binderfs(void)
+{
+	return 0;
+}
+#endif
+
 #endif /* _LINUX_BINDER_INTERNAL_H */
drivers/android/binderfs.c +1 -3
index 7a550104a722..e773f45d19d9 100644
@@ -550,7 +550,7 @@ static struct file_system_type binder_fs_type = {
 	.fs_flags	= FS_USERNS_MOUNT,
 };
 
-static int __init init_binderfs(void)
+int __init init_binderfs(void)
 {
 	int ret;
 
@@ -568,5 +568,3 @@ static int __init init_binderfs(void)
 
 	return ret;
 }
-
-device_initcall(init_binderfs);
Signature · 1 line
2.20.1
maintainer
#2 lore raw

Re: [PATCH 2/2] binderfs: remove separate device_initcall()

Quoted 62 lines · Christian Brauner

binderfs should not have a separate device_initcall(). When a kernel is compiled with CONFIG_ANDROID_BINDERFS register the filesystem alongside CONFIG_ANDROID_IPC. This use-case is especially sensible when users specify CONFIG_ANDROID_IPC=y, CONFIG_ANDROID_BINDERFS=y and ANDROID_BINDER_DEVICES="".
When CONFIG_ANDROID_BINDERFS=n then this always succeeds so there's no regression potential for legacy workloads.

---
 drivers/android/binder.c          | 4 ++++
 drivers/android/binder_internal.h | 9 +++++++++
 drivers/android/binderfs.c        | 4 +---
 3 files changed, 14 insertions(+), 3 deletions(-)
drivers/android/binder.c +4 -0
index cdfc87629efb..751d76173f81 100644
@@ -5915,6 +5915,10 @@ static int __init binder_init(void)
 			goto err_init_binder_device_failed;
 	}
 
+	ret = init_binderfs();
+	if (ret)
+		goto err_init_binder_device_failed;
+
 	return ret;
 
 err_init_binder_device_failed:
drivers/android/binder_internal.h +9 -0
index 7fb97f503ef2..045b3e42d98b 100644
@@ -46,4 +46,13 @@ static inline bool is_binderfs_device(const struct inode *inode)
 }
 #endif
 
+#ifdef CONFIG_ANDROID_BINDERFS
+extern int __init init_binderfs(void);
+#else
+static inline int __init init_binderfs(void)
+{
+	return 0;
+}
+#endif
+
 #endif /* _LINUX_BINDER_INTERNAL_H */
drivers/android/binderfs.c +1 -1
index 7a550104a722..e773f45d19d9 100644
@@ -550,7 +550,7 @@ static struct file_system_type binder_fs_type = {
 	.fs_flags	= FS_USERNS_MOUNT,
 };
 
-static int __init init_binderfs(void)
+int __init init_binderfs(void)
 {
 	int ret;
 

drivers/android/binderfs.c static int __init init_binderfs(void) · line 572

Quoted 5 lines
drivers/android/binderfs.c +0 -2
@@ -568,5 +568,3 @@ static int __init init_binderfs(void)
 
 	return ret;
 }
-
-device_initcall(init_binderfs);

I get a build warning when applying this patch :(

Please fix up and resend.

thanks,

greg k-h

author maintainer
#3 lore raw

Re: [PATCH 2/2] binderfs: remove separate device_initcall()

Quoted 62 lines · Greg KH
Quoted 61 lines · Christian Brauner

binderfs should not have a separate device_initcall(). When a kernel is compiled with CONFIG_ANDROID_BINDERFS register the filesystem alongside CONFIG_ANDROID_IPC. This use-case is especially sensible when users specify CONFIG_ANDROID_IPC=y, CONFIG_ANDROID_BINDERFS=y and ANDROID_BINDER_DEVICES="".
When CONFIG_ANDROID_BINDERFS=n then this always succeeds so there's no regression potential for legacy workloads.

---
 drivers/android/binder.c          | 4 ++++
 drivers/android/binder_internal.h | 9 +++++++++
 drivers/android/binderfs.c        | 4 +---
 3 files changed, 14 insertions(+), 3 deletions(-)
drivers/android/binder.c +4 -0
index cdfc87629efb..751d76173f81 100644
@@ -5915,6 +5915,10 @@ static int __init binder_init(void)
 			goto err_init_binder_device_failed;
 	}
 
+	ret = init_binderfs();
+	if (ret)
+		goto err_init_binder_device_failed;
+
 	return ret;
 
 err_init_binder_device_failed:
drivers/android/binder_internal.h +9 -0
index 7fb97f503ef2..045b3e42d98b 100644
@@ -46,4 +46,13 @@ static inline bool is_binderfs_device(const struct inode *inode)
 }
 #endif
 
+#ifdef CONFIG_ANDROID_BINDERFS
+extern int __init init_binderfs(void);
+#else
+static inline int __init init_binderfs(void)
+{
+	return 0;
+}
+#endif
+
 #endif /* _LINUX_BINDER_INTERNAL_H */
drivers/android/binderfs.c +1 -1
index 7a550104a722..e773f45d19d9 100644
@@ -550,7 +550,7 @@ static struct file_system_type binder_fs_type = {
 	.fs_flags	= FS_USERNS_MOUNT,
 };
 
-static int __init init_binderfs(void)
+int __init init_binderfs(void)
 {
 	int ret;
 
Quoted 8 lines

drivers/android/binderfs.c static int __init init_binderfs(void) · line 572

Quoted 6 lines
drivers/android/binderfs.c +0 -2
@@ -568,5 +568,3 @@ static int __init init_binderfs(void)
 
 	return ret;
 }
-
-device_initcall(init_binderfs);

I get a build warning when applying this patch :(

Hm, I can't reproduce that build error with this patch applied to what you currently have in char-misc-linus. :(
Any chance you can give me the config that produced this warning? I tried with CONFIG_BINDERFS=y and CONFIG_BINDERFS=n.

Thanks!
Christian

maintainer
#4 lore raw

Re: [PATCH 2/2] binderfs: remove separate device_initcall()

Quoted 72 lines · Christian Brauner
Quoted 62 lines · Greg KH
Quoted 61 lines · Christian Brauner

binderfs should not have a separate device_initcall(). When a kernel is compiled with CONFIG_ANDROID_BINDERFS register the filesystem alongside CONFIG_ANDROID_IPC. This use-case is especially sensible when users specify CONFIG_ANDROID_IPC=y, CONFIG_ANDROID_BINDERFS=y and ANDROID_BINDER_DEVICES="".
When CONFIG_ANDROID_BINDERFS=n then this always succeeds so there's no regression potential for legacy workloads.

---
 drivers/android/binder.c          | 4 ++++
 drivers/android/binder_internal.h | 9 +++++++++
 drivers/android/binderfs.c        | 4 +---
 3 files changed, 14 insertions(+), 3 deletions(-)
drivers/android/binder.c +4 -0
index cdfc87629efb..751d76173f81 100644
@@ -5915,6 +5915,10 @@ static int __init binder_init(void)
 			goto err_init_binder_device_failed;
 	}
 
+	ret = init_binderfs();
+	if (ret)
+		goto err_init_binder_device_failed;
+
 	return ret;
 
 err_init_binder_device_failed:
drivers/android/binder_internal.h +9 -0
index 7fb97f503ef2..045b3e42d98b 100644
@@ -46,4 +46,13 @@ static inline bool is_binderfs_device(const struct inode *inode)
 }
 #endif
 
+#ifdef CONFIG_ANDROID_BINDERFS
+extern int __init init_binderfs(void);
+#else
+static inline int __init init_binderfs(void)
+{
+	return 0;
+}
+#endif
+
 #endif /* _LINUX_BINDER_INTERNAL_H */
drivers/android/binderfs.c +1 -1
index 7a550104a722..e773f45d19d9 100644
@@ -550,7 +550,7 @@ static struct file_system_type binder_fs_type = {
 	.fs_flags	= FS_USERNS_MOUNT,
 };
 
-static int __init init_binderfs(void)
+int __init init_binderfs(void)
 {
 	int ret;
 
Quoted 8 lines

drivers/android/binderfs.c static int __init init_binderfs(void) · line 572

Quoted 6 lines
drivers/android/binderfs.c +0 -2
@@ -568,5 +568,3 @@ static int __init init_binderfs(void)
 
 	return ret;
 }
-
-device_initcall(init_binderfs);

I get a build warning when applying this patch :(

Quoted 4 lines

Hm, I can't reproduce that build error with this patch applied to what you currently have in char-misc-linus. :(
Any chance you can give me the config that produced this warning? I tried with CONFIG_BINDERFS=y and CONFIG_BINDERFS=n.

$ make M=drivers/android
  CC      drivers/android/binderfs.o
  CC      drivers/android/binder.o
drivers/android/binder.c: In function ‘binder_init’:
drivers/android/binder.c:5933:2: warning: ‘device_names’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  kfree(device_names);
  ^~~~~~~~~~~~~~~~~~~
$ gcc --version
gcc (GCC) 8.2.1 20181127

And gcc is right about this warning, that could happen with your change :(

thanks,

greg k-h

author maintainer
#5 lore raw

Re: [PATCH 2/2] binderfs: remove separate device_initcall()

Quoted 86 lines · Greg KH
Quoted 72 lines · Christian Brauner
Quoted 62 lines · Greg KH
Quoted 61 lines · Christian Brauner

binderfs should not have a separate device_initcall(). When a kernel is compiled with CONFIG_ANDROID_BINDERFS register the filesystem alongside CONFIG_ANDROID_IPC. This use-case is especially sensible when users specify CONFIG_ANDROID_IPC=y, CONFIG_ANDROID_BINDERFS=y and ANDROID_BINDER_DEVICES="".
When CONFIG_ANDROID_BINDERFS=n then this always succeeds so there's no regression potential for legacy workloads.

---
 drivers/android/binder.c          | 4 ++++
 drivers/android/binder_internal.h | 9 +++++++++
 drivers/android/binderfs.c        | 4 +---
 3 files changed, 14 insertions(+), 3 deletions(-)
drivers/android/binder.c +4 -0
index cdfc87629efb..751d76173f81 100644
@@ -5915,6 +5915,10 @@ static int __init binder_init(void)
 			goto err_init_binder_device_failed;
 	}
 
+	ret = init_binderfs();
+	if (ret)
+		goto err_init_binder_device_failed;
+
 	return ret;
 
 err_init_binder_device_failed:
drivers/android/binder_internal.h +9 -0
index 7fb97f503ef2..045b3e42d98b 100644
@@ -46,4 +46,13 @@ static inline bool is_binderfs_device(const struct inode *inode)
 }
 #endif
 
+#ifdef CONFIG_ANDROID_BINDERFS
+extern int __init init_binderfs(void);
+#else
+static inline int __init init_binderfs(void)
+{
+	return 0;
+}
+#endif
+
 #endif /* _LINUX_BINDER_INTERNAL_H */
drivers/android/binderfs.c +1 -1
index 7a550104a722..e773f45d19d9 100644
@@ -550,7 +550,7 @@ static struct file_system_type binder_fs_type = {
 	.fs_flags	= FS_USERNS_MOUNT,
 };
 
-static int __init init_binderfs(void)
+int __init init_binderfs(void)
 {
 	int ret;
 
Quoted 8 lines

drivers/android/binderfs.c static int __init init_binderfs(void) · line 572

Quoted 6 lines
drivers/android/binderfs.c +0 -2
@@ -568,5 +568,3 @@ static int __init init_binderfs(void)
 
 	return ret;
 }
-
-device_initcall(init_binderfs);

I get a build warning when applying this patch :(

Quoted 4 lines

Hm, I can't reproduce that build error with this patch applied to what you currently have in char-misc-linus. :(
Any chance you can give me the config that produced this warning? I tried with CONFIG_BINDERFS=y and CONFIG_BINDERFS=n.

$ make M=drivers/android
  CC      drivers/android/binderfs.o
  CC      drivers/android/binder.o
drivers/android/binder.c: In function ‘binder_init’:
drivers/android/binder.c:5933:2: warning: ‘device_names’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  kfree(device_names);
  ^~~~~~~~~~~~~~~~~~~
Quoted 4 lines
$ gcc --version
gcc (GCC) 8.2.1 20181127

And gcc is right about this warning, that could happen with your change :(

Thanks for the pointer. New version sent out that fixes this issue! :)

Thanks!
Christian