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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 E3D21C10F11 for ; Mon, 22 Apr 2019 19:48:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A69092190B for ; Mon, 22 Apr 2019 19:48:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962515; bh=zVLT+shqz30hEIKp4PmR2RPYN544gBgZ/FPVorhLtiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=smSirsczXC9JafcBiUNknrQLsfOMBiMjPKjqKWiF7GXF6wjVjOykEYo1RkibpVdVU 815oVd1R3ZiEZ3R0vh2BEOiV9y+BIfSq2TAgt+u0Xa6PN197AZn74L+XgPUTwP4vaU 48I/juTUZLFAb10A+rA/lP45tBUBpqj6f6bJt4Qw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730571AbfDVTse (ORCPT ); Mon, 22 Apr 2019 15:48:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:51870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730561AbfDVTsd (ORCPT ); Mon, 22 Apr 2019 15:48:33 -0400 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 B03AC21915; Mon, 22 Apr 2019 19:48:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962512; bh=zVLT+shqz30hEIKp4PmR2RPYN544gBgZ/FPVorhLtiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fu/8iMKcNJCyyzArraym5owB8x2pOfAG5vkVng3/g3djz51j5GQXPYHMLDDu/Rc4+ AA7QZ65FJr2D7CH/xcZYBlSGEHnQNu1csYzvt7ZkBVaKEb/We50cH/KLpJXVIZJx/n Y10VxAVlGmjQCGG9WCR2kLq0byqiSYgYlSc71XmI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 33/43] usb: usb251xb: fix to avoid potential NULL pointer dereference Date: Mon, 22 Apr 2019 15:47:17 -0400 Message-Id: <20190422194727.12495-33-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194727.12495-1-sashal@kernel.org> References: <20190422194727.12495-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Aditya Pakki [ Upstream commit 41f00e6e9e55546390031996b773e7f3c1d95928 ] of_match_device in usb251xb_probe can fail and returns a NULL pointer. The patch avoids a potential NULL pointer dereference in this scenario. Signed-off-by: Aditya Pakki Reviewed-by: Richard Leitner Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin (Microsoft) --- drivers/usb/misc/usb251xb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c index 135c91c434bf..ba8fcdb377e8 100644 --- a/drivers/usb/misc/usb251xb.c +++ b/drivers/usb/misc/usb251xb.c @@ -530,7 +530,7 @@ static int usb251xb_probe(struct usb251xb *hub) dev); int err; - if (np) { + if (np && of_id) { err = usb251xb_get_ofdata(hub, (struct usb251xb_data *)of_id->data); if (err) { -- 2.19.1