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 13494C33CAF for ; Thu, 16 Jan 2020 17:13:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC568246A7 for ; Thu, 16 Jan 2020 17:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194819; bh=pWEElET2TJj1Rs3U7xsrYRFMhcDQkuh7Oq+mAcenkEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KIEhWGg2fhD0kKaAIn4lBOBwBcW20eBAPreE5w7pIAobPCsasWkMcy+e6GA6KaLZ7 RAnZlbOTlpjf5+Rc/b2JtTXTJ2qQz5YjUuD7Udk7VSPqN3bvdif2kVj/1wIFvDyRiQ OjsKf2F46ZXcCTggSoYiy6Mz9TzT8smn1oOqfNqk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390790AbgAPRNj (ORCPT ); Thu, 16 Jan 2020 12:13:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:59038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390779AbgAPRNh (ORCPT ); Thu, 16 Jan 2020 12:13:37 -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 91741246AB; Thu, 16 Jan 2020 17:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194816; bh=pWEElET2TJj1Rs3U7xsrYRFMhcDQkuh7Oq+mAcenkEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gml7VjfNl3j+VGixfyVzgC9jeEUJtBJjncFoIJYGhkTcUdnWQCbeYWlAv0nIypTTk PHfvCzSM72O+VnE/1NBz3gjv5imhF/XlpfIabVbpA8YNEIm0rkxInE0DyEL/oHrGgF 1hW3G6KSCv6wD5w45Iod851fcQoRLpe/Ax9QlZ5c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Niklas Cassel , Bjorn Andersson , Lorenzo Pieralisi , Andrew Murray , Gustavo Pimentel , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 622/671] PCI: dwc: Fix find_next_bit() usage Date: Thu, 16 Jan 2020 12:04:20 -0500 Message-Id: <20200116170509.12787-359-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-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: Niklas Cassel [ Upstream commit 1137e61dcb99f7f8b54e77ed83f68b5b485a3e34 ] find_next_bit() takes a parameter of size long, and performs arithmetic that assumes that the argument is of size long. Therefore we cannot pass a u32, since this will cause find_next_bit() to read outside the stack buffer and will produce the following print: BUG: KASAN: stack-out-of-bounds in find_next_bit+0x38/0xb0 Fixes: 1b497e6493c4 ("PCI: dwc: Fix uninitialized variable in dw_handle_msi_irq()") Tested-by: Bjorn Andersson Signed-off-by: Niklas Cassel Signed-off-by: Lorenzo Pieralisi Reviewed-by: Andrew Murray Acked-by: Gustavo Pimentel Signed-off-by: Sasha Levin --- drivers/pci/controller/dwc/pcie-designware-host.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index b57ee79f6d69..6d4ef0101ef6 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -78,7 +78,8 @@ static struct msi_domain_info dw_pcie_msi_domain_info = { irqreturn_t dw_handle_msi_irq(struct pcie_port *pp) { int i, pos, irq; - u32 val, num_ctrls; + unsigned long val; + u32 status, num_ctrls; irqreturn_t ret = IRQ_NONE; num_ctrls = pp->num_vectors / MAX_MSI_IRQS_PER_CTRL; @@ -86,14 +87,14 @@ irqreturn_t dw_handle_msi_irq(struct pcie_port *pp) for (i = 0; i < num_ctrls; i++) { dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_STATUS + (i * MSI_REG_CTRL_BLOCK_SIZE), - 4, &val); - if (!val) + 4, &status); + if (!status) continue; ret = IRQ_HANDLED; + val = status; pos = 0; - while ((pos = find_next_bit((unsigned long *) &val, - MAX_MSI_IRQS_PER_CTRL, + while ((pos = find_next_bit(&val, MAX_MSI_IRQS_PER_CTRL, pos)) != MAX_MSI_IRQS_PER_CTRL) { irq = irq_find_mapping(pp->irq_domain, (i * MAX_MSI_IRQS_PER_CTRL) + -- 2.20.1