Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68090543 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc fixes from Greg KH:
 "Here are some small char and misc driver fixes for 5.0-rc6.

  Nothing huge here, some more binderfs fixups found as people use it,
  and there is a "large" selftest added to validate the binderfs code,
  which makes up the majority of this pull request.

  There's also some small mei and mic fixes to resolve some reported
  issues.

  All of these have been in linux-next for over a week with no reported
  issues"

* tag 'char-misc-5.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  mic: vop: Fix crash on remove
  mic: vop: Fix use-after-free on remove
  binderfs: remove separate device_initcall()
  fpga: stratix10-soc: fix wrong of_node_put() in init function
  mic: vop: Fix broken virtqueues
  mei: free read cb on ctrl_wr list flush
  samples: mei: use /dev/mei0 instead of /dev/mei
  mei: me: add ice lake point device id.
  binderfs: respect limit on binder control creation
  binder: fix CONFIG_ANDROID_BINDER_DEVICES
  selftests: add binderfs selftests
parents 8c8e62cc 4bf13fdb

drivers/android/binder.c

+22 −15
Original line number Diff line number Diff line
@@ -5854,9 +5854,10 @@ static int __init init_binder_device(const char *name) 
static int __init binder_init(void)

{

	int ret;

	char *device_name, *device_names, *device_tmp;

	char *device_name, *device_tmp;

	struct binder_device *device;

	struct hlist_node *tmp;

	char *device_names = NULL;



	ret = binder_alloc_shrinker_init();

	if (ret)
@@ -5898,6 +5899,7 @@ static int __init binder_init(void) 
				    &transaction_log_fops);

	}



	if (strcmp(binder_devices_param, "") != 0) {

		/*

		* Copy the module_parameter string, because we don't want to

		* tokenize it in-place.
@@ -5914,6 +5916,11 @@ static int __init binder_init(void) 
			if (ret)

				goto err_init_binder_device_failed;

		}

	}



	ret = init_binderfs();

	if (ret)

		goto err_init_binder_device_failed;



	return ret;

drivers/android/binder_internal.h

+9 −0
Original line number Diff line number Diff line
@@ -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

+10 −4
Original line number Diff line number Diff line
@@ -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;
@@ -542,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;
@@ -560,5 +568,3 @@ static int __init init_binderfs(void) 


	return ret;

}
 


device_initcall(init_binderfs);

drivers/fpga/stratix10-soc.c

+1 −4
Original line number Diff line number Diff line
@@ -508,14 +508,11 @@ static int __init s10_init(void) 
		return -ENODEV;



	np = of_find_matching_node(fw_np, s10_of_match);

	if (!np) {

		of_node_put(fw_np);

	if (!np)

		return -ENODEV;

	}



	of_node_put(np);

	ret = of_platform_populate(fw_np, s10_of_match, NULL, NULL);

	of_node_put(fw_np);

	if (ret)

		return ret;

drivers/misc/mei/client.c

+4 −1
Original line number Diff line number Diff line
@@ -401,8 +401,11 @@ static void mei_io_list_flush_cl(struct list_head *head, 
	struct mei_cl_cb *cb, *next;



	list_for_each_entry_safe(cb, next, head, list) {

		if (cl == cb->cl)

		if (cl == cb->cl) {

			list_del_init(&cb->list);

			if (cb->fop_type == MEI_FOP_READ)

				mei_io_cb_free(cb);

		}

	}

}