drivers: android: Use octal permissions
PATCH 1/2 drivers: android: Use octal permissions
From: Harsh Shandilya <[email protected]>
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.
--- drivers/android/binder.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/android/binder.c +8 -8
@@ -141,7 +141,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,0444 );
@@ -160,7 +160,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 { \
@@ -4679,7 +4679,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);
@@ -5518,27 +5518,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);
Signature · 1 line
2.15.0.631.g7ddcec0
PATCH 2/2 drivers: android: Fix logtags in methods
From: Harsh Shandilya <[email protected]>
Several methods in the driver were hardcoding the function name in their logging calls which is a checkpatch violation. Utilise the __func__ macro to avoid needing to add the function name as is to the string.
Test: logtags in dmesg remain unaffected before and after the patch.
--- drivers/android/binder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/android/binder.c +7 -6
@@ -4467,8 +4467,8 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)unsigned int size =_IOC_SIZE (cmd);void __user *ubuf = (void __user *)arg; -/*pr_info("binder_ioctl: %d:%d %x %lx\n", -proc->pid, current->pid, cmd, arg);*/ +// pr_info("%s: %d:%d %x %lx\n", +// __func__, proc->pid, current->pid, cmd, arg); binder_selftest_alloc (&proc->alloc);
@@ -4631,8 +4631,9 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma)return 0 ; err_bad_arg: -pr_err ("binder_mmap: %d %lx-%lx %s failed %d\n" , - proc->pid, vma->vm_start, vma->vm_end, failure_string, ret); +pr_err ("%s: %d %lx-%lx %s failed %d\n" , + __func__, proc->pid, vma->vm_start, vma->vm_end, + failure_string, ret);return ret; }
@@ -4641,8 +4642,8 @@ static int binder_open(struct inode *nodp, struct file *filp)struct binder_proc *proc;struct binder_device *binder_dev; -binder_debug (BINDER_DEBUG_OPEN_CLOSE ,"binder_open: %d:%d\n" , - current->group_leader->pid, current->pid); +binder_debug (BINDER_DEBUG_OPEN_CLOSE ,"%s: %d:%d\n" , + __func__, current->group_leader->pid, current->pid); proc =kzalloc (sizeof (*proc),GFP_KERNEL );if (proc ==NULL )
Signature · 1 line
2.15.0.631.g7ddcec0
Greg Kroah-Hartman
maintainerRe: [PATCH 2/2] drivers: android: Fix logtags in methods
Quoted 19 lines · Harsh Shandilya
From: Harsh Shandilya <[email protected]>
Several methods in the driver were hardcoding the function name in their logging calls which is a checkpatch violation. Utilise the
__func__macro to avoid needing to add the function name as is to the string.Test: logtags in dmesg remain unaffected before and after the patch.
Signed-off-by Harsh Shandilya <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc "Arve Hjønnevåg" <[email protected]>Cc Todd Kjos <[email protected]>Cc Martijn Coenen <[email protected]>
Quoted 3 lines
--- drivers/android/binder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
Patch does not apply to my tree :(
Re: [PATCH 2/2] drivers: android: Fix logtags in methods
Quoted 24 lines · Greg Kroah-Hartman,
Quoted 19 lines · Harsh Shandilya
From: Harsh Shandilya <[email protected]>
Several methods in the driver were hardcoding the function name in their logging calls which is a checkpatch violation. Utilise the
__func__macro to avoid needing to add the function name as is to the string.Test: logtags in dmesg remain unaffected before and after the patch.
Signed-off-by Harsh Shandilya <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc "Arve Hjønnevåg" <[email protected]>Cc Todd Kjos <[email protected]>Cc Martijn Coenen <[email protected]>Quoted 3 lines
--- drivers/android/binder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
Quoted 2 lines
Patch does not apply to my tree :(
If you drop
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/commit/?h=char-misc-next&id=00c41cddebde8d1a635bf81a7b255b7e56fd0d15
then the patch should go in cleanly. My patch includes the changes from Elad's already.
P.S. sorry about the derp with the email earlier, I didn't realise I used "Reply" in place of "Reply all". Will take care henceforth.
Quoted 1 line
Greg Kroah-Hartman
maintainerRe: [PATCH 2/2] drivers: android: Fix logtags in methods
Quoted 27 lines · Harsh Shandilya
Quoted 24 lines · Greg Kroah-Hartman,
Quoted 22 lines · Harsh Shandilya
From: Harsh Shandilya <[email protected]>
Several methods in the driver were hardcoding the function name in their logging calls which is a checkpatch violation. Utilise the
__func__macro to avoid needing to add the function name as is to the string.Test: logtags in dmesg remain unaffected before and after the patch.
Signed-off-by Harsh Shandilya <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc "Arve Hjønnevåg" <[email protected]>Cc Todd Kjos <[email protected]>Cc Martijn Coenen <[email protected]>--- drivers/android/binder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
Quoted 7 lines
Quoted 2 lines
Patch does not apply to my tree :(
If you drop
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/commit/?h=char-misc-next&id=00c41cddebde8d1a635bf81a7b255b7e56fd0d15
then the patch should go in cleanly. My patch includes the changes from Elad's already.
That patch came first in my inbox, I'm not going to revert it from the tree now, sorry.
Just rebase and resend if your patch did "more".
thanks,
greg k-h
Re: [PATCH 2/2] drivers: android: Fix logtags in methods
Quoted 38 lines · Greg Kroah-Hartman,
Quoted 1 line · Harsh Shandilya
On Tue 9 Jan, 2018, 10:32 PM Greg Kroah-Hartman, <
Quoted 26 lines
Quoted 24 lines · wrote:
Quoted 22 lines · Harsh Shandilya
From: Harsh Shandilya <[email protected]>
Several methods in the driver were hardcoding the function name in their logging calls which is a checkpatch violation. Utilise the
__func__macro to avoid needing to add the function name as is to the string.Test: logtags in dmesg remain unaffected before and after the patch.
Signed-off-by Harsh Shandilya <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc "Arve Hjønnevåg" <[email protected]>Cc Todd Kjos <[email protected]>Cc Martijn Coenen <[email protected]>--- drivers/android/binder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)Quoted 5 lines
Quoted 2 lines
Patch does not apply to my tree :(
If you drop
Quoted 2 lines
then the patch should go in cleanly. My patch includes the changes from Elad's already.
Quoted 9 lines
That patch came first in my inbox, I'm not going to revert it from the tree now, sorry.
Just rebase and resend if your patch did "more".
thanks,
greg k-h
Comparing both patches again I think Elad's is the better one to keep since the only difference between his and mine is that I also fixed up a commented out pr_info call. You can ignore my patch, sorry for the noise.