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

Commit 174562af authored by Harsh Shandilya's avatar Harsh Shandilya Committed by Martijn Coenen
Browse files

UPSTREAM: android: binder: Use octal permissions 



checkpatch warns against the use of symbolic permissions,
this patch migrates all symbolic permissions in the binder
driver to octal permissions.

Test: debugfs nodes created by binder have the same unix
permissions prior to and after this patch was applied.

Signed-off-by: default avatarHarsh Shandilya <harsh@prjkt.io>
Cc: "Arve Hjønnevåg" <arve@android.com>
Cc: Todd Kjos <tkjos@android.com>
Cc: Martijn Coenen <maco@android.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 21d02ddf716669e182a13b69b4dd928cf8ef5e0f)

Change-Id: I8152fe280ead1d04d89593e813a722f9eb5def27
parent 6b64640c

drivers/android/binder.c

+8 −8
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ enum { 
};

static uint32_t binder_debug_mask = BINDER_DEBUG_USER_ERROR |

	BINDER_DEBUG_FAILED_TRANSACTION | BINDER_DEBUG_DEAD_TRANSACTION;

module_param_named(debug_mask, binder_debug_mask, uint, S_IWUSR | S_IRUGO);

module_param_named(debug_mask, binder_debug_mask, uint, 0644);



static char *binder_devices_param = CONFIG_ANDROID_BINDER_DEVICES;

module_param_named(devices, binder_devices_param, charp, S_IRUGO);
@@ -161,7 +161,7 @@ static int binder_set_stop_on_user_error(const char *val, 
	return ret;

}

module_param_call(stop_on_user_error, binder_set_stop_on_user_error,

	param_get_int, &binder_stop_on_user_error, S_IWUSR | S_IRUGO);

	param_get_int, &binder_stop_on_user_error, 0644);



#define binder_debug(mask, x...) \

	do { \
@@ -4965,7 +4965,7 @@ static int binder_open(struct inode *nodp, struct file *filp) 
		 * anyway print all contexts that a given PID has, so this

		 * is not a problem.

		 */

		proc->debugfs_entry = debugfs_create_file(strbuf, S_IRUGO,

		proc->debugfs_entry = debugfs_create_file(strbuf, 0444,

			binder_debugfs_dir_entry_proc,

			(void *)(unsigned long)proc->pid,

			&binder_proc_fops);
@@ -5794,27 +5794,27 @@ static int __init binder_init(void) 


	if (binder_debugfs_dir_entry_root) {

		debugfs_create_file("state",

				    S_IRUGO,

				    0444,

				    binder_debugfs_dir_entry_root,

				    NULL,

				    &binder_state_fops);

		debugfs_create_file("stats",

				    S_IRUGO,

				    0444,

				    binder_debugfs_dir_entry_root,

				    NULL,

				    &binder_stats_fops);

		debugfs_create_file("transactions",

				    S_IRUGO,

				    0444,

				    binder_debugfs_dir_entry_root,

				    NULL,

				    &binder_transactions_fops);

		debugfs_create_file("transaction_log",

				    S_IRUGO,

				    0444,

				    binder_debugfs_dir_entry_root,

				    &binder_transaction_log,

				    &binder_transaction_log_fops);

		debugfs_create_file("failed_transaction_log",

				    S_IRUGO,

				    0444,

				    binder_debugfs_dir_entry_root,

				    &binder_transaction_log_failed,

				    &binder_transaction_log_fops);