From patchwork Thu May 17 16:42:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10407149 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D94FE60155 for ; Thu, 17 May 2018 16:42:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C534A285F9 for ; Thu, 17 May 2018 16:42:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B78B528604; Thu, 17 May 2018 16:42:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 302A5285F9 for ; Thu, 17 May 2018 16:42:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752450AbeEQQmI (ORCPT ); Thu, 17 May 2018 12:42:08 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:54172 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752348AbeEQQmH (ORCPT ); Thu, 17 May 2018 12:42:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=XnpGDGjpQHJYF/mDL+pWNNfw7JrTBt9ssnxAySXBIFc=; b=sTwIcX7nx3FV 5Wb6uFnjIEeXOIkbqC9w8yuL6xyR8ykVMjVbviFnonUES2fpdKSeTBjg3IO7wuEkWfFcLhjcNQAUn a7l/w5ZNRkY4p5ikHCnN2+mkLIZDgW8uAPfBpKDl0EpvYjnkl1prZKJvY3YBluKNSzmFrE2Unio4s U9tPw=; Received: from [37.205.61.206] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fJLyd-00015A-BA; Thu, 17 May 2018 16:42:03 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 7BB0444007E; Thu, 17 May 2018 17:42:00 +0100 (BST) From: Mark Brown To: Boris Brezillon Cc: Dan Carpenter , Mark Brown , Mark Brown , linux-spi@vger.kernel.org, Vignesh R , Dan Carpenter , linux-spi@vger.kernel.org Subject: Applied "spi: ti-qspi: Make sure res_mmap != NULL before dereferencing it" to the spi tree In-Reply-To: <20180514091129.3422-1-boris.brezillon@bootlin.com> Message-Id: <20180517164200.7BB0444007E@finisterre.ee.mobilebroadband> Date: Thu, 17 May 2018 17:42:00 +0100 (BST) Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: ti-qspi: Make sure res_mmap != NULL before dereferencing it has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 6282f122913e632c2415c236a2b5faa8ef368b10 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Mon, 14 May 2018 11:11:29 +0200 Subject: [PATCH] spi: ti-qspi: Make sure res_mmap != NULL before dereferencing it resource_size() is dereferencing the res without checking that it is not NULL, so we need to do the check before calling resource_size(). Fixes: b95cb394ab59 ("spi: ti-qspi: Implement the spi_mem interface") Reported-by: Dan Carpenter Signed-off-by: Boris Brezillon Signed-off-by: Mark Brown --- drivers/spi/spi-ti-qspi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c index c54b760e00ed..5f19016bbf10 100644 --- a/drivers/spi/spi-ti-qspi.c +++ b/drivers/spi/spi-ti-qspi.c @@ -718,7 +718,9 @@ static int ti_qspi_probe(struct platform_device *pdev) "memory mapped resource not required\n"); } } - qspi->mmap_size = resource_size(res_mmap); + + if (res_mmap) + qspi->mmap_size = resource_size(res_mmap); irq = platform_get_irq(pdev, 0); if (irq < 0) {