Commit de52e953 authored by Aditya Pakki's avatar Aditya Pakki Committed by Khalid Elmously

rfkill: Fix incorrect check to avoid NULL pointer dereference

BugLink: https://bugs.launchpad.net/bugs/1859640

[ Upstream commit 6fc232db ]

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: default avatarAditya Pakki <pakki001@umn.edu>
Link: https://lore.kernel.org/r/20191215153409.21696-1-pakki001@umn.eduSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 6d13de14
...@@ -1003,10 +1003,13 @@ static void rfkill_sync_work(struct work_struct *work) ...@@ -1003,10 +1003,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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment