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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 212FEC00454 for ; Tue, 10 Dec 2019 21:12:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB4AC206EC for ; Tue, 10 Dec 2019 21:12:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576012347; bh=pHpn+rzuC6YQTRftAIk78Kki8xbXONoabqYa5T6oz6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Iv9JfIWuyOXsv3O9AohTq6idOKdmehFekYPc6Ei0i+gnp9Ukrn6pFxMpITo24Cb6z hghQJXSeGSdFexca9TWOdkdl05lDhTO9DQwqIVNTHr1+RZU1RYj/3IMOocgW0KeSW+ WaesHsGWiV/DYa6Wj7BZwXRdQr1hTgCNIH+Ls6bE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728962AbfLJVMZ (ORCPT ); Tue, 10 Dec 2019 16:12:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:35752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728637AbfLJVMM (ORCPT ); Tue, 10 Dec 2019 16:12:12 -0500 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 8515B246C3; Tue, 10 Dec 2019 21:12:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576012332; bh=pHpn+rzuC6YQTRftAIk78Kki8xbXONoabqYa5T6oz6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qs7mbRYTY3h4uMw7WZUBwhxVuSfJLJ7x6ETZrgaPQM/+1/HKwNefkWu9RGx2IYQZz 5FoHNIqd2FZpHi0hl80v2SNSK4ynRAPZvUypaTbKz8+djYvO/ZcowHqIn/XfJ6VtZw vN54vSOIRplR0RJm9LCUZDjsDKdo9IGdJ2FT4aEM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chuhong Yuan , Mark Brown , Sasha Levin , linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 264/350] spi: pxa2xx: Add missed security checks Date: Tue, 10 Dec 2019 16:06:09 -0500 Message-Id: <20191210210735.9077-225-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210210735.9077-1-sashal@kernel.org> References: <20191210210735.9077-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 068c210376799..452cef367696d 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1565,7 +1565,13 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) #endif 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