From patchwork Thu Jun 22 15:41:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 9804713 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 8A48460234 for ; Thu, 22 Jun 2017 15:42:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79AA2286E7 for ; Thu, 22 Jun 2017 15:42:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E1DC286E5; Thu, 22 Jun 2017 15:42:15 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 019592867E for ; Thu, 22 Jun 2017 15:42:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=7kpd5fL1wqW6QCVyQNnOZtC9Swyu4Akfm+lkvN/YjKg=; b=B1A2HN/tBlALQS C+wo2JHnS30SeFCMmtV61ZVewA+0dwx2KNy574KwCrFb/0EIIlz8m4Mg5PGYn9FsA26IV27Nb6wvn tuOO6560aXxre5omWkWUeB/Q0V6TfCb/+8WPZ9Ylhw9NqwV+VFUCuLjxwF3MfTY/z+uJ6q2zCE1Sd tcRcUa12FR8TobvH/jxQhjSgY242nSw0xJUG4JQKRMjOuTpFmSWudh8DvAlkBHffTxKAOjoJHuaeE neZViW5YfAbHl4ZNpAdrJmwTsyQeI+hLrO49hPu+PNTwIAeSt0b40EX1cFtcNGCXaJtgL1e+Uel+J lGyTGdB3UK4DCXYYk8Yg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dO4FJ-0004b6-6D; Thu, 22 Jun 2017 15:42:13 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dO4FF-0004Kc-Dp for linux-arm-kernel@lists.infradead.org; Thu, 22 Jun 2017 15:42:11 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dO4Eo-0008Fe-Pt; Thu, 22 Jun 2017 15:41:42 +0000 From: Colin King To: Mark Brown , Maxime Coquelin , Alexandre Torgue , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH][spi-next] spi: stm32: fix range limit checks on div Date: Thu, 22 Jun 2017 16:41:42 +0100 Message-Id: <20170622154142.22481-1-colin.king@canonical.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170622_084209_638857_B96C00F4 X-CRM114-Status: UNSURE ( 8.51 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Colin Ian King Currently the check for range limits on div is incorrect and will never return -EINVAL. Fix this by replacing && with || Detected by CoverityScan, CID#1446580 ("Structurally dead code") Signed-off-by: Colin Ian King Reviewed-by: Amelie Delaunay --- drivers/spi/spi-stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c index 0553f61ab3b7..b75909e7b117 100644 --- a/drivers/spi/spi-stm32.c +++ b/drivers/spi/spi-stm32.c @@ -262,7 +262,7 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz) * no need to check it there. * However, we need to ensure the following calculations. */ - if ((div < SPI_MBR_DIV_MIN) && + if ((div < SPI_MBR_DIV_MIN) || (div > SPI_MBR_DIV_MAX)) return -EINVAL;