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=unavailable 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 70AC1C2D0CE for ; Sun, 29 Dec 2019 18:15:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 418CC207E0 for ; Sun, 29 Dec 2019 18:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577643329; bh=DEQeULJrGLmf9jSz1w+iSat9ZUgWPoGMgMYTCOXCQU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LW3OxCL5heqo+2C3lWAW2o4ZYa9Nq1jFlFLKilRFtwPdiK12qq9o8SogBDY4Wsdmy vtvij5+h5FJ9O1H+6mYj6lhVpmeuj3pYRBFk+zyPK78qZ2F3Rpu0apQj+VS6qCL3FB GOQvca41gNA8Xe+1iHet4BBz4VVMrqOSanddVHLY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727984AbfL2RZb (ORCPT ); Sun, 29 Dec 2019 12:25:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:45424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727980AbfL2RZa (ORCPT ); Sun, 29 Dec 2019 12:25:30 -0500 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 8A7EC21744; Sun, 29 Dec 2019 17:25:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640330; bh=DEQeULJrGLmf9jSz1w+iSat9ZUgWPoGMgMYTCOXCQU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UNlDeSCLeN4urQAZ+kpSxs8QR8/yjh72jC+RQZN/gL10c2wS9X9w4aJg2Gxz6OnEt fjS4wAfOVYnu6qD48hQjUbHFPCY+KkzYKuGmPe5ZBdnGgSo23GQKp7WlyxDTVePmgS ms70wlJXjFdTUI8xRf5z9ju1AmTtLd3Qou1d055Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuhong Yuan , Mark Brown , Sasha Levin Subject: [PATCH 4.14 112/161] spi: pxa2xx: Add missed security checks Date: Sun, 29 Dec 2019 18:19:20 +0100 Message-Id: <20191229162430.916925761@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162355.500086350@linuxfoundation.org> References: <20191229162355.500086350@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: Chuhong Yuan [ Upstream commit 5eb263ef08b5014cfc2539a838f39d2fd3531423 ] pxa2xx_spi_init_pdata misses checks for devm_clk_get and platform_get_irq. Add checks for them to fix the bugs. Since ssp->clk and ssp->irq are used in probe, they are mandatory here. So we cannot use _optional() for devm_clk_get and platform_get_irq. Signed-off-by: Chuhong Yuan Link: https://lore.kernel.org/r/20191109080943.30428-1-hslester96@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-pxa2xx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 9bf3e5f945c7..b2245cdce230 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1559,7 +1559,13 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) } ssp->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(ssp->clk)) + return NULL; + ssp->irq = platform_get_irq(pdev, 0); + if (ssp->irq < 0) + return NULL; + ssp->type = type; ssp->pdev = pdev; ssp->port_id = pxa2xx_spi_get_port_id(adev); -- 2.20.1