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=-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,URIBL_BLOCKED,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 D593EC282CE for ; Mon, 22 Apr 2019 19:46:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9866F21905 for ; Mon, 22 Apr 2019 19:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962398; bh=VdwnfoZOwTW/qkf1SJD7k6BhKVlobA00pdlu90t0HTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0JVLkpDQF5DUnekuJFuuD6pWxAxrlLmfnVivzdBav2crY7jmDw9i3iMUYSw4/ZliT nTmoUjZ08qmmv3Qmvw/iPFQ7tTFcrM0KTotduMWLvFhZLRbFOp/jv1owJ7FRfPeDKa rY8i/gERfEB/u6UVxW1YsyjAeHhkzNnEyPtolbMc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729996AbfDVTqh (ORCPT ); Mon, 22 Apr 2019 15:46:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:48878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729986AbfDVTqg (ORCPT ); Mon, 22 Apr 2019 15:46:36 -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 98D02218D9; Mon, 22 Apr 2019 19:46:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962396; bh=VdwnfoZOwTW/qkf1SJD7k6BhKVlobA00pdlu90t0HTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EE8HQ8COHevuv3kuohQVtUepTU3Iu0peMnVo9AMcVbwM/j91VpOO7cnc5iveK1RkW OVp+3BKr5Anrex7B7xQZoZrl66BCeZVhpIkGzOUsprfw6gTbvWG0X3YwNFDN2YR7Yl O2w0MXdnH+Mw3GLcrXef7mWT2vT4oARpiGmpLqpw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , Greg Kroah-Hartman , Sasha Levin , devel@driverdev.osuosl.org Subject: [PATCH AUTOSEL 4.19 34/68] staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc Date: Mon, 22 Apr 2019 15:44:42 -0400 Message-Id: <20190422194516.11634-34-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194516.11634-1-sashal@kernel.org> References: <20190422194516.11634-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 6a8ca24590a2136921439b376c926c11a6effc0e ] phydm.internal is allocated using kzalloc which is used multiple times without a check for NULL pointer. This patch avoids such a scenario by returning 0, consistent with the failure case. Signed-off-by: Aditya Pakki Reviewed-by: Mukesh Ojha Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin (Microsoft) --- drivers/staging/rtlwifi/phydm/rtl_phydm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/rtlwifi/phydm/rtl_phydm.c b/drivers/staging/rtlwifi/phydm/rtl_phydm.c index 9930ed954abb..4cc77b2016e1 100644 --- a/drivers/staging/rtlwifi/phydm/rtl_phydm.c +++ b/drivers/staging/rtlwifi/phydm/rtl_phydm.c @@ -180,6 +180,8 @@ static int rtl_phydm_init_priv(struct rtl_priv *rtlpriv, rtlpriv->phydm.internal = kzalloc(sizeof(struct phy_dm_struct), GFP_KERNEL); + if (!rtlpriv->phydm.internal) + return 0; _rtl_phydm_init_com_info(rtlpriv, ic, params); -- 2.19.1