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=ham 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 74D92C2BA83 for ; Fri, 14 Feb 2020 16:22:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F34924750 for ; Fri, 14 Feb 2020 16:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581697370; bh=NQhSwyYXRqDIefeJAhsB5HufY4DubhhD3WurtJ5yuNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nBZcuBhw1XjmfN8L3ZB4+SEK6gF3duYttwFdeqxWV0MKxMFId1ZYj4gKAWGFFwdVA zOX5WGxM3BwLl9t4or7yYKT8/HMUHzf309A2TfFGQdHMYv9pdMoULR1geyEPs6fbfy 8BDHutfX96oj+hmUQZw/lx/Pvu2YNcvMXRSUGC4o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393245AbgBNQWs (ORCPT ); Fri, 14 Feb 2020 11:22:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:58644 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387583AbgBNQWr (ORCPT ); Fri, 14 Feb 2020 11:22:47 -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 DBF0F24758; Fri, 14 Feb 2020 16:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581697366; bh=NQhSwyYXRqDIefeJAhsB5HufY4DubhhD3WurtJ5yuNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2je1zYD6dBD+jaM/oMEPYaRw0+OiNgGJGMyCN+rw2gJvEMGJudKu8k5Yzw1gITIfm lCpq/BkHdb+glGb5rFeAX394mroINaAG+te33pVOc7VW5POYoWrbtVCRw2DkaUkrKA u3Cg66Xvcn7CtN2pN3psR2HO3ldh2LWPzJQ93ijE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 066/141] orinoco: avoid assertion in case of NULL pointer Date: Fri, 14 Feb 2020 11:20:06 -0500 Message-Id: <20200214162122.19794-66-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214162122.19794-1-sashal@kernel.org> References: <20200214162122.19794-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 c705f9fc6a1736dcf6ec01f8206707c108dca824 ] In ezusb_init, if upriv is NULL, the code crashes. However, the caller in ezusb_probe can handle the error and print the failure message. The patch replaces the BUG_ON call to error return. Signed-off-by: Aditya Pakki Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/intersil/orinoco/orinoco_usb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c index 8244d82629511..4e91c74fcfad9 100644 --- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c @@ -1351,7 +1351,8 @@ static int ezusb_init(struct hermes *hw) int retval; BUG_ON(in_interrupt()); - BUG_ON(!upriv); + if (!upriv) + return -EINVAL; upriv->reply_count = 0; /* Write the MAGIC number on the simulated registers to keep -- 2.20.1