Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp7352654yba; Thu, 2 May 2019 08:28:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqyGU0M2CDm7b8wcQ/hCorrZGrI2p21Je/DwFKf86fOK0n5qnw3CSzBzonp4xENI7Xmee71b X-Received: by 2002:a62:b61a:: with SMTP id j26mr4718084pff.203.1556810936092; Thu, 02 May 2019 08:28:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556810936; cv=none; d=google.com; s=arc-20160816; b=oewby2g2/1LzFDy651JxGQVV59j6fAHfImedoKmbNXvLBLZui9SK9GO/kmpdj0ibjo 64zJ5i8K2a9+V2M42xLti9/wQ8JyAby9CLd2q8Xda3s38H6t+gPpgIU5shdn8WhL3MHH U7v2vTSoy/1RMynH2G7aLoavOLyl7+sY7K8Z3fZjWTv+I3AM7rVr+xalYlJ8D2mPBssV DWcbZxfKqTWXG6c2kYtWPP9brO4VCkoDPae0XEJkv/fadwWou9cc/umDA99BKAFaG6J1 obsx/VFTfpcs4P/k3fl6BOq65VjICBc9AJ0n3nuK+UKWlcWXGDHPuL+UByZl38RjXpmG 5upg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dclX76oGyPT6unjDA7OtaWxEDKLdkCJk916RdmQnilI=; b=CxWnMrysCcHaA37xOBsin9gm3DgGNIAViM1E17gmgJoMja5dmXyPoPful/6EVotdwE M15IyxtonTOI5tp0ExBIdwknDfIEIzlDhGpyjtyxAOIAuuSBZAQgsiaoS0se8wfziiva +U20ittLUvDq1sGyKWEGiZz2YIIbForzKHmxSpgEgzEkop9Hlq8hORb+QMHJsVEaVG+d cxj5+z+qWAgGMzk77b5LM+ome7Vxyx933p+GMykt9NomXx+0zVKbR2TX5VuzLtasXg22 JgviGPAr5kov1uZRJ9EI8JRx13lylyfkZtajqkM+HeFKcbCyDE1EEGoXGNiNzBgazKEB k+qQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WTb0L0sc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 16si44591673pfh.244.2019.05.02.08.28.41; Thu, 02 May 2019 08:28:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WTb0L0sc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727889AbfEBP1C (ORCPT + 99 others); Thu, 2 May 2019 11:27:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:43760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727872AbfEBP1B (ORCPT ); Thu, 2 May 2019 11:27:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3E7E520675; Thu, 2 May 2019 15:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810820; bh=JQbYPHIpqP8fqYTV7zW572CvJ9OkL86ocBrnCAKxIwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WTb0L0scw2rXGGZRsiIjlzPsa+ByVsdFHk7+Exw3tAgkUvClry/iHtZQQqZyeD+jY WVNzHFwy6Lfw3yyzi5bsxz00OhMrxZxzf2e5RflGxJgIEZz+NatsS9hjrqCfN2AGIq By795rdyQyDuyYKcxLnPox+6Y3oCwbN5LGVCTvC4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aditya Pakki , Mukesh Ojha , "Sasha Levin (Microsoft)" Subject: [PATCH 4.19 40/72] staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc Date: Thu, 2 May 2019 17:21:02 +0200 Message-Id: <20190502143336.695229343@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190502143333.437607839@linuxfoundation.org> References: <20190502143333.437607839@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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