mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 00:48:50 +00:00
Code Issues Releases Wiki Activity

rfkill: Fix incorrect check to avoid NULL pointer dereference

Browse source 
In rfkill_register, the struct rfkill pointer is first derefernced
and then checked for NULL. This patch removes the BUG_ON and returns
an error to the caller in case rfkill is NULL.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Link: https://lore.kernel.org/r/20191215153409.21696-1-pakki001@umn.edu
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Aditya Pakki 2019-12-15 09:34:08 -06:00 committed by Johannes Berg
parent 911bde0fe5
commit 6fc232db9e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/rfkill/core.c
View file

@ -1002,10 +1002,13 @@ static void rfkill_sync_work(struct work_struct *work)
int __must_check rfkill_register(struct rfkill *rfkill) int __must_check rfkill_register(struct rfkill *rfkill)
{ {
static unsigned long rfkill_no; static unsigned long rfkill_no;
struct device *dev = &rfkill->dev; struct device *dev;
int error; int error;
BUG_ON(!rfkill); if (!rfkill)
return -EINVAL;
dev = &rfkill->dev;
mutex_lock(&rfkill_global_mutex); mutex_lock(&rfkill_global_mutex);