Received: by 2002:a05:6a10:6d25:0:0:0:0 with SMTP id gq37csp1884612pxb; Mon, 13 Sep 2021 07:31:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzc1AilEyy1H/he7phI+o+N4BxW5cFN0v3K/sT9dYMCkjBAIqDFwQ3um/mclXjP1ta2xViD X-Received: by 2002:a05:6e02:ee8:: with SMTP id j8mr520846ilk.170.1631543465777; Mon, 13 Sep 2021 07:31:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631543465; cv=none; d=google.com; s=arc-20160816; b=RdMJ/wI3b0jACWaeVfl4j7xYEzMIOqG/Je125oB9wjLfIri7R2GOO+GqobAm1ZIS86 btZeAaG+VwU6HQLkolGwwiq8hqRCkyLt0TeJbOJjxRY4q3FL2/6tIKI0Ugl5dOLz1g02 t9MjLPNQEWWNQUFMrgHrMmWSWMT2Aw7a/GN0DXzjwFayRSm1kQTrDYVxJyldRmC8XQD4 7nV5XeZkTbxKZMwahhMJTf3GIRHahIgsLpVNz/DDXzXynIRYFwiBqF4UKpsQ+ThrRrOn xMLvKZRoXMgtotaBOq1dMSzGBKp/lfc7RLGYvZKhuDOzIdafiYBVs0anNmXhRzJCI0rq 8Wig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2mZDGX4iHnMlVVwpAsnnISRwjouVuulp3UDgyTBrzpA=; b=O4lo4nWcG50vJtpsFm6wrIWyPzIlkIZOYxPAUEsB7fp4fsscXprlKRMNotL/rcQu/B yaTOHjF6b0qn9wHywrlktHjizEiapaAiC8ELbldv5qsZNxk2wxtJdlMZiCd5vIxehlrO Uvcebt9kvyUeLy039hlRtb2pxBxbWOZJfnEZceFQmWpuJoDdcFRYZD/gaYuPBK7SJJjP q64bJpvNwna/gXA0clHKiuNEe//jGiJLm0gfgHoiBbWFFCRx1plIXbY0EWVe86hBTccL UTFN6Y0LnstqDFYRQDAlJle0QR/OKEy9jiCIb1Uq+VGmt4mMyYQLA1OD7Nwsv69bPrXr dtSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cEx+vKg1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m9si7034901iow.85.2021.09.13.07.30.52; Mon, 13 Sep 2021 07:31:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cEx+vKg1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345123AbhIMO2J (ORCPT + 99 others); Mon, 13 Sep 2021 10:28:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:45776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345491AbhIMOW7 (ORCPT ); Mon, 13 Sep 2021 10:22:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B868F61B3D; Mon, 13 Sep 2021 13:47:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631540873; bh=N/kBMNMc89UjZ1rYFYPHugE5EWUilALer50Wm74LmXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cEx+vKg1kwrgGoH1h3mXsojbUPnd2ONChun0Q/ATXp4brC5f3JWS9fuoX8ndNzM8e h/jAHEfe0vbUoekp4Ay8PRHHkXiXcPnKbP+mbktT1MbBLkLAwJfWZjyaJI5sGWj9KR hNm3BIEXhsoGu4Gpa8rQooXLnkleb3t9uuqkGOAA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Giovanni Cabiddu , Marco Chiappero , Fiona Trahe , Herbert Xu , Sasha Levin Subject: [PATCH 5.14 070/334] crypto: qat - use proper type for vf_mask Date: Mon, 13 Sep 2021 15:12:04 +0200 Message-Id: <20210913131115.770042601@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131113.390368911@linuxfoundation.org> References: <20210913131113.390368911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Giovanni Cabiddu [ Upstream commit 462354d986b6a89c6449b85f17aaacf44e455216 ] Replace vf_mask type with unsigned long to avoid a stack-out-of-bound. This is to fix the following warning reported by KASAN the first time adf_msix_isr_ae() gets called. [ 692.091987] BUG: KASAN: stack-out-of-bounds in find_first_bit+0x28/0x50 [ 692.092017] Read of size 8 at addr ffff88afdf789e60 by task swapper/32/0 [ 692.092076] Call Trace: [ 692.092089] [ 692.092101] dump_stack+0x9c/0xcf [ 692.092132] print_address_description.constprop.0+0x18/0x130 [ 692.092164] ? find_first_bit+0x28/0x50 [ 692.092185] kasan_report.cold+0x7f/0x111 [ 692.092213] ? static_obj+0x10/0x80 [ 692.092234] ? find_first_bit+0x28/0x50 [ 692.092262] find_first_bit+0x28/0x50 [ 692.092288] adf_msix_isr_ae+0x16e/0x230 [intel_qat] Fixes: ed8ccaef52fa ("crypto: qat - Add support for SRIOV") Signed-off-by: Giovanni Cabiddu Reviewed-by: Marco Chiappero Reviewed-by: Fiona Trahe Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/qat/qat_common/adf_isr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/qat/qat_common/adf_isr.c b/drivers/crypto/qat/qat_common/adf_isr.c index e3ad5587be49..daab02011717 100644 --- a/drivers/crypto/qat/qat_common/adf_isr.c +++ b/drivers/crypto/qat/qat_common/adf_isr.c @@ -15,6 +15,8 @@ #include "adf_transport_access_macros.h" #include "adf_transport_internal.h" +#define ADF_MAX_NUM_VFS 32 + static int adf_enable_msix(struct adf_accel_dev *accel_dev) { struct adf_accel_pci *pci_dev_info = &accel_dev->accel_pci_dev; @@ -72,7 +74,7 @@ static irqreturn_t adf_msix_isr_ae(int irq, void *dev_ptr) struct adf_bar *pmisc = &GET_BARS(accel_dev)[hw_data->get_misc_bar_id(hw_data)]; void __iomem *pmisc_bar_addr = pmisc->virt_addr; - u32 vf_mask; + unsigned long vf_mask; /* Get the interrupt sources triggered by VFs */ vf_mask = ((ADF_CSR_RD(pmisc_bar_addr, ADF_ERRSOU5) & @@ -93,8 +95,7 @@ static irqreturn_t adf_msix_isr_ae(int irq, void *dev_ptr) * unless the VF is malicious and is attempting to * flood the host OS with VF2PF interrupts. */ - for_each_set_bit(i, (const unsigned long *)&vf_mask, - (sizeof(vf_mask) * BITS_PER_BYTE)) { + for_each_set_bit(i, &vf_mask, ADF_MAX_NUM_VFS) { vf_info = accel_dev->pf.vf_info + i; if (!__ratelimit(&vf_info->vf2pf_ratelimit)) { -- 2.30.2