From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21B98C2D0C6 for ; Fri, 27 Dec 2019 18:05:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E87C1206CB for ; Fri, 27 Dec 2019 18:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577469900; bh=C+NNpZfVWEVv8+U0pb2S8VTCXw0o6t6TbKDCPh8iPm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bp5EtJUV/eAVmtTGZo8SJmpJZSaKkPQRQMFLI7AjUWIuMM8VIg/5y3MpK68eLiesN Ouf7uM7wxddctfgntKGP56E7q6XobLBGTdmNtJxy4Y1ZSuE1dYMvWVUUYuol56StXq a9V/3j40HWN+37m890BX9mbo0YDrs8ucNACJKn34= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728499AbfL0SE6 (ORCPT ); Fri, 27 Dec 2019 13:04:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:60336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728507AbfL0SDK (ORCPT ); Fri, 27 Dec 2019 13:03:10 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A49D021582; Fri, 27 Dec 2019 18:03:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577469789; bh=C+NNpZfVWEVv8+U0pb2S8VTCXw0o6t6TbKDCPh8iPm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PKNpsyWeSzzNzh6YdT2NngtxScqrzmY6di92XaGdfM+9MKWrp26LfaJT0cdc80KmE VZrkWMA9DDBU8ywJFZxr2NVIHZV9VENjZQRFBKKU29SkoRBmMOeyWA3k5evgvhJZE9 exyD20AoxRl5t0X7PHSRl1N8IdXN5qaNPdqoCerQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 38/57] rfkill: Fix incorrect check to avoid NULL pointer dereference Date: Fri, 27 Dec 2019 13:02:03 -0500 Message-Id: <20191227180222.7076-38-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191227180222.7076-1-sashal@kernel.org> References: <20191227180222.7076-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aditya Pakki [ Upstream commit 6fc232db9e8cd50b9b83534de9cd91ace711b2d7 ] 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 Link: https://lore.kernel.org/r/20191215153409.21696-1-pakki001@umn.edu Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/rfkill/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 2064c3a35ef8..b6388335fe66 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -998,10 +998,13 @@ static void rfkill_sync_work(struct work_struct *work) int __must_check rfkill_register(struct rfkill *rfkill) { static unsigned long rfkill_no; - struct device *dev = &rfkill->dev; + struct device *dev; int error; - BUG_ON(!rfkill); + if (!rfkill) + return -EINVAL; + + dev = &rfkill->dev; mutex_lock(&rfkill_global_mutex); -- 2.20.1