a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rfkill: Use mutex_lock() at register and add sanity check

Browse Source 
Replace mutex_lock_interruptible() by mutex_lock() in rfkill_register(),
as interruptible doesn't make sense there.

Add a sanity check for rfkill->type, as that's used for an unchecked dereference
in an array and might cause hard to debug crashes if the driver sets this
to an invalid value.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch 2007-10-28 15:16:50 +01:00 committed by David S. Miller
parent f51359a8fb
commit 7319f1e6bc
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/rfkill/rfkill.c
View File

@ -276,21 +276,17 @@ static struct class rfkill_class = {
static int rfkill_add_switch(struct rfkill *rfkill) static int rfkill_add_switch(struct rfkill *rfkill)
{ {
int retval; int error;
retval = mutex_lock_interruptible(&rfkill_mutex); mutex_lock(&rfkill_mutex);
if (retval)
return retval;
retval = rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type]); error = rfkill_toggle_radio(rfkill, rfkill_states[rfkill->type]);
if (retval) if (!error)
goto out; list_add_tail(&rfkill->node, &rfkill_list);
list_add_tail(&rfkill->node, &rfkill_list);
out:
mutex_unlock(&rfkill_mutex); mutex_unlock(&rfkill_mutex);
return retval;
return error;
} }
static void rfkill_remove_switch(struct rfkill *rfkill) static void rfkill_remove_switch(struct rfkill *rfkill)
@ -387,6 +383,8 @@ int rfkill_register(struct rfkill *rfkill)
if (!rfkill->toggle_radio) if (!rfkill->toggle_radio)
return -EINVAL; return -EINVAL;
if (rfkill->type >= RFKILL_TYPE_MAX)
return -EINVAL;
snprintf(dev->bus_id, sizeof(dev->bus_id), snprintf(dev->bus_id, sizeof(dev->bus_id),
"rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1); "rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);