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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 8D34EC2D0DB for ; Fri, 24 Jan 2020 09:48:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5AEBD20718 for ; Fri, 24 Jan 2020 09:48:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859294; bh=HAw4S1gBe/g/LNIX93+Cp4icEvnyUdS6ePsP+BY3Y1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NzCrMTuYxUdeLROBaTzadY/F1guh0mL5sdQPLpv3WQ03MqM4HA7xy2nu1URGsxbTj Fxck6Bbx4bN/jpmtWc2tOYRQ7Ds8XSgLvxcWlimqIDseK8xNSYGw6ALPOcvEaqvWIu 1JDF350zxAuybyt4j2oggG6ggDLNfBpsJ/UHn3EE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732700AbgAXJsN (ORCPT ); Fri, 24 Jan 2020 04:48:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:48226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730051AbgAXJsN (ORCPT ); Fri, 24 Jan 2020 04:48:13 -0500 Received: from localhost (unknown [145.15.244.15]) (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 A68B921734; Fri, 24 Jan 2020 09:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859292; bh=HAw4S1gBe/g/LNIX93+Cp4icEvnyUdS6ePsP+BY3Y1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PPNDgO0iUBx/OcVZIvfzwlolDhb4MdrWmCnIABmUQptnhoHLaV0y2e7NN3X06Oyyh a9XWm5FIkTBmOTCnTaWrQEZZUlBu7FF0H/xFUKy/3HlfsNoTej3zOzPitm0eC10Dt2 r5i6+V4WoPY7aLuQf59nVXZ/v0of7SH2ioS31VbI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , Mark Brown , Sasha Levin Subject: [PATCH 4.14 072/343] spi/topcliff_pch: Fix potential NULL dereference on allocation error Date: Fri, 24 Jan 2020 10:28:10 +0100 Message-Id: <20200124092929.299475526@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: YueHaibing [ Upstream commit e902cdcb5112b89ee445588147964723fd69ffb4 ] In pch_spi_handle_dma, it doesn't check for NULL returns of kcalloc so it would result in an Oops. Fixes: c37f3c2749b5 ("spi/topcliff_pch: DMA support") Signed-off-by: YueHaibing Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-topcliff-pch.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index 4389ab80c23e6..fa730a871d252 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c @@ -1008,6 +1008,9 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw) /* RX */ dma->sg_rx_p = kcalloc(num, sizeof(*dma->sg_rx_p), GFP_ATOMIC); + if (!dma->sg_rx_p) + return; + sg_init_table(dma->sg_rx_p, num); /* Initialize SG table */ /* offset, length setting */ sg = dma->sg_rx_p; @@ -1068,6 +1071,9 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw) } dma->sg_tx_p = kcalloc(num, sizeof(*dma->sg_tx_p), GFP_ATOMIC); + if (!dma->sg_tx_p) + return; + sg_init_table(dma->sg_tx_p, num); /* Initialize SG table */ /* offset, length setting */ sg = dma->sg_tx_p; -- 2.20.1