leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rfkill: Use switch to demux userspace operations

Browse Source 
Using a switch to handle different ev.op values in rfkill_fop_write()
makes the code easier to extend, as out-of-range values can always be
handled by the default case.

Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com>
[roll in fix for RFKILL_OP_CHANGE from Jouni]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
João Paulo Rechi Vita 2016-02-22 11:36:39 -05:00 committed by Johannes Berg
parent 98bd147d79
commit 1948b2a2ec
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
net/rfkill/core.c
View File

@ -1141,6 +1141,7 @@ static ssize_t rfkill_fop_write(struct file *file, const char __user *buf,
{ {
struct rfkill *rfkill; struct rfkill *rfkill;
struct rfkill_event ev; struct rfkill_event ev;
int ret;
/* we don't need the 'hard' variable but accept it */ /* we don't need the 'hard' variable but accept it */
if (count < RFKILL_EVENT_SIZE_V1 - 1) if (count < RFKILL_EVENT_SIZE_V1 - 1)
@ -1155,29 +1156,36 @@ static ssize_t rfkill_fop_write(struct file *file, const char __user *buf,
if (copy_from_user(&ev, buf, count)) if (copy_from_user(&ev, buf, count))
return -EFAULT; return -EFAULT;
if (ev.op != RFKILL_OP_CHANGE && ev.op != RFKILL_OP_CHANGE_ALL)
return -EINVAL;
if (ev.type >= NUM_RFKILL_TYPES) if (ev.type >= NUM_RFKILL_TYPES)
return -EINVAL; return -EINVAL;
mutex_lock(&rfkill_global_mutex); mutex_lock(&rfkill_global_mutex);
if (ev.op == RFKILL_OP_CHANGE_ALL) switch (ev.op) {
case RFKILL_OP_CHANGE_ALL:
rfkill_update_global_state(ev.type, ev.soft); rfkill_update_global_state(ev.type, ev.soft);
list_for_each_entry(rfkill, &rfkill_list, node)
list_for_each_entry(rfkill, &rfkill_list, node) { if (rfkill->type == ev.type ||
if (rfkill->idx != ev.idx && ev.op != RFKILL_OP_CHANGE_ALL) ev.type == RFKILL_TYPE_ALL)
continue; rfkill_set_block(rfkill, ev.soft);
ret = 0;
if (rfkill->type != ev.type && ev.type != RFKILL_TYPE_ALL) break;
continue; case RFKILL_OP_CHANGE:
list_for_each_entry(rfkill, &rfkill_list, node)
rfkill_set_block(rfkill, ev.soft); if (rfkill->idx == ev.idx &&
(rfkill->type == ev.type ||
ev.type == RFKILL_TYPE_ALL))
rfkill_set_block(rfkill, ev.soft);
ret = 0;
break;
default:
ret = -EINVAL;
break;
} }
mutex_unlock(&rfkill_global_mutex); mutex_unlock(&rfkill_global_mutex);
return count; return ret ?: count;
} }
static int rfkill_fop_release(struct inode *inode, struct file *file) static int rfkill_fop_release(struct inode *inode, struct file *file)