| Message ID | 888c23ff-1ee4-4795-8c24-7631c6c37da6@moroto.mountain |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-37217-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id
p19csp1048396dyi;
Wed, 24 Jan 2024 07:06:47 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IEMu5N5ce/KKt7x4Phrqg3hKc93lr0rgd6g7VhPswjloExB3xtvaMs3/cWQvtv/Xr5xIU5v
X-Received: by 2002:a17:90a:4b8f:b0:28e:82df:5559 with SMTP id
i15-20020a17090a4b8f00b0028e82df5559mr4687566pjh.23.1706108807399;
Wed, 24 Jan 2024 07:06:47 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1706108807; cv=pass;
d=google.com; s=arc-20160816;
b=bDEoB1ZUs6idy+5k9GyiC6t1JFRux5SttttNrvRw93/yxy7fa31shEjqxIMwBu3yZb
xomySNuiOemWfQGvmLyVZMKzIaDfVhTmMGh7rPTFUpxWVA45QqJ9MTJfT9PtV2f8R2YZ
L+dZxzlRSXmqpJn7bVS3sOPTQpWhMd1RU8GWHWcI1WHExuN6SZOxXmBn0AaWupcHXZZv
rLPacrlCU+AC3kOS7/sBmJAGu3EnlyDZyN0JYjDIxXy+YPVf9S521adTjoJBakbUM6t4
79imap1czvaetMMw3jTDuqJpyrnIgITtuDCycbxZTESs3l+JCIVxGwrzw+xpSmLPmVY2
694g==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=content-disposition:mime-version:list-unsubscribe:list-subscribe
:list-id:precedence:message-id:subject:cc:to:from:date
:dkim-signature;
bh=wddH6dLZWFvD4sBtP23ayzipvN9tjMLSLEUIemLS/70=;
fh=AMP6jLY/YgAkWlcuKAii2N0FHrlJK6sTn/slWMNRfkk=;
b=byor3Z7PFSzOP/0gCDmdnE+iy1IrdFgQ+/EAVg/u/MgSq814Zd3Jye5NwcvVFvYMEE
tzuCR05tJ4CbveOzIfMLLguibKMbZrVVTxwv0Kn/lX7fH3RLibYj+/4fSzFZeo7NeKY4
Ja6JXKjGs4XF2rG6lFiyJ6Y6urBvjIUWeWLO/oNMVKpS8/+u3BsOLygOdPYN8RJX84aU
1fzCs5DEU2P8WsAVxf62ovJY9IVNds1G2iU2thBGCiLt1jYhmhNjaFGaybFqOw8bcuPc
2BLRSUNB4tZiAho8NKB6Vbkpo4batOj6yzAinx85YSuA38vEl4Bwn0bMEd6kcpBF0qqG
zo9A==
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=dyhySwho;
arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass
dkdomain=linaro.org dmarc=pass fromdomain=linaro.org);
spf=pass (google.com: domain of
linux-kernel+bounces-37217-ouuuleilei=gmail.com@vger.kernel.org designates
139.178.88.99 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-37217-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org
Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99])
by mx.google.com with ESMTPS id
q18-20020a17090aa01200b0028caf24a3cbsi4940459pjp.100.2024.01.24.07.06.47
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 24 Jan 2024 07:06:47 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-37217-ouuuleilei=gmail.com@vger.kernel.org designates
139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Authentication-Results: mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=dyhySwho;
arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass
dkdomain=linaro.org dmarc=pass fromdomain=linaro.org);
spf=pass (google.com: domain of
linux-kernel+bounces-37217-ouuuleilei=gmail.com@vger.kernel.org designates
139.178.88.99 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-37217-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by sv.mirrors.kernel.org (Postfix) with ESMTPS id 855A42928BE
for <ouuuleilei@gmail.com>; Wed, 24 Jan 2024 15:02:22 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 7DEB27A73A;
Wed, 24 Jan 2024 15:01:53 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org
header.b="dyhySwho"
Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com
[209.85.221.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3021363124
for <linux-kernel@vger.kernel.org>; Wed, 24 Jan 2024 15:01:49 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=209.85.221.52
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1706108510; cv=none;
b=epFKZMkAmaH7Nr5+4bdUceB6ntagfIHPw8cqgsov88qJujpLirbCs/7pLS3dQs3GpPEV2zngwmVjVCxzsC7ksW2K2aei2FYlOOCZ4RG71I7ApeYXgfyt0vSXGfF0kKaXhoxUfkMghoYpw5r34pL6gI8iAEYVNF5fEoGgK1bVrIw=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1706108510; c=relaxed/simple;
bh=vXo7kwrg/JEtFg5VNFewRcL3UlxCm3whtvjszAzZPYw=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:
Content-Disposition;
b=CMITfJncLSdMjssUUWnTvdL/dQUBFoIz+xyjkodZ2V0wM8Hw8AMdW+9fkOmdmiiJWV6FMGSf5LcgwHSlmpRMnOHG+8igXsniohdGV4RK9E3BHfcvjwBUg/fySLtlKRoU0OOL62easx2QmWaeuNMXVj3k0VhS3wMm4Etc0bA5USQ=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=linaro.org;
spf=pass smtp.mailfrom=linaro.org;
dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org
header.b=dyhySwho; arc=none smtp.client-ip=209.85.221.52
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=linaro.org
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=linaro.org
Received: by mail-wr1-f52.google.com with SMTP id
ffacd0b85a97d-3387ef9fc62so5153492f8f.2
for <linux-kernel@vger.kernel.org>;
Wed, 24 Jan 2024 07:01:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1706108507; x=1706713307;
darn=vger.kernel.org;
h=content-disposition:mime-version:message-id:subject:cc:to:from:date
:from:to:cc:subject:date:message-id:reply-to;
bh=wddH6dLZWFvD4sBtP23ayzipvN9tjMLSLEUIemLS/70=;
b=dyhySwhofWH+JkOgzDfSLBlzS9igtUKpI70OvObtint2kwDXlu+crjO9IJGnpK4TI2
zjwSGBmTDmNyZ7UsPFTWn0XgAcLA7cHnQWozb14ep80vxlgnCsvKc+XAsee6vFQ1xw74
mxZT2wKqj1JIJ4Gl2MdzeWGElr85Lnyj8ss65BMn02is8cLtiQ7IBXMPhsEiuH/h2dKa
By74+WvCjk4lIxVaq0FoAZ/8kq1IgZPlYsZhnFWSn7W5SOkn87eXMhJm3pnHB170beGM
G0IUm0/bhnKz38V3tnQKWNqS+GnfnxrSZ8W8tVTQRGJSmzbjdbyXOIygJTVc1MOh3CMC
7f3A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1706108507; x=1706713307;
h=content-disposition:mime-version:message-id:subject:cc:to:from:date
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=wddH6dLZWFvD4sBtP23ayzipvN9tjMLSLEUIemLS/70=;
b=aEqGdfVCjJRLqqHYX6xIByuMQQOIVMVzQ1DqXP27TWUg2m2XUU9tXNpBZv0FS18rWo
kvNZ6tcATnNQIVB7rYtYKH2QJd/HcRqTj93RXJyoCJNrVIkjJPijwcGtqfTBVUt8F5A/
nmTwo7tUspTooCRzUXg6O+A0+MYmQM6OIdQSHrBEAp1ydvNqzuVybOSWBINy6nkeG0c3
FKegWzC+zupvlWbo4sPlLTmE1nc3HqpoxaC6jhfsb4W6fJ5LK4wgSyhnzmXmnqTTJToj
gjcPHDII4vbUDGR2aotcwkYf/1wbjU47ONPlsIumO9cv+AhX590mf8L3a9zQBIc2Ir83
R2zw==
X-Gm-Message-State: AOJu0YzziEBAHYs1r1ryNEvqCoPnTbnhGiMLIaKPQWASykHGnYQ+oqiO
4h9SsqAGRjpBlfWUQ3ykIcHcsDTW0UA8IZWnBWpHeO6wAJGpg1JovqQ9kZ+mTv0=
X-Received: by 2002:adf:ef12:0:b0:337:bf29:b6ca with SMTP id
e18-20020adfef12000000b00337bf29b6camr701919wro.23.1706108507315;
Wed, 24 Jan 2024 07:01:47 -0800 (PST)
Received: from localhost ([102.140.209.237])
by smtp.gmail.com with ESMTPSA id
o10-20020a5d62ca000000b00337d4ce6ab4sm15999360wrv.20.2024.01.24.07.01.46
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 24 Jan 2024 07:01:46 -0800 (PST)
Date: Wed, 24 Jan 2024 18:01:42 +0300
From: Dan Carpenter <dan.carpenter@linaro.org>
To: Niklas Cassel <niklas.cassel@wdc.com>
Cc: Jingoo Han <jingoohan1@gmail.com>,
Gustavo Pimentel <gustavo.pimentel@synopsys.com>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
Lorenzo Pieralisi <lpieralisi@kernel.org>, Krzysztof =?utf-8?q?Wilczy=C5=84?=
=?utf-8?q?ski?= <kw@linux.com>, Rob Herring <robh@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH v4 1/2] PCI: dwc: Fix a 64bit bug in
dw_pcie_ep_raise_msix_irq()
Message-ID: <888c23ff-1ee4-4795-8c24-7631c6c37da6@moroto.mountain>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Mailer: git-send-email haha only kidding
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1788984749093336519
X-GMAIL-MSGID: 1788984749093336519
|
| Series |
[v4,1/2] PCI: dwc: Fix a 64bit bug in dw_pcie_ep_raise_msix_irq()
|
|
Commit Message
Dan Carpenter
Jan. 24, 2024, 3:01 p.m. UTC
The "msg_addr" variable is u64. However, the "aligned_offset" is an
unsigned int. This means that when the code does:
msg_addr &= ~aligned_offset;
it will unintentionally zero out the high 32 bits. Use ALIGN_DOWN()
to do the alignment instead.
Cc: stable@vger.kernel.org
Fixes: 2217fffcd63f ("PCI: dwc: endpoint: Fix dw_pcie_ep_raise_msix_irq() alignment support")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Niklas Cassel <cassel@kernel.org>
---
v4: Add stable and r-b from Niklas
v3: Use ALIGN_DOWN()
v2: fix typo in commit message
drivers/pci/controller/dwc/pcie-designware-ep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Wed, 24 Jan 2024, Dan Carpenter wrote: > The "msg_addr" variable is u64. However, the "aligned_offset" is an > unsigned int. This means that when the code does: > > msg_addr &= ~aligned_offset; > > it will unintentionally zero out the high 32 bits. Use ALIGN_DOWN() > to do the alignment instead. > > Cc: stable@vger.kernel.org > Fixes: 2217fffcd63f ("PCI: dwc: endpoint: Fix dw_pcie_ep_raise_msix_irq() alignment support") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > Reviewed-by: Niklas Cassel <cassel@kernel.org> > --- > v4: Add stable and r-b from Niklas > v3: Use ALIGN_DOWN() > v2: fix typo in commit message > > drivers/pci/controller/dwc/pcie-designware-ep.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c > index 5befed2dc02b..51679c6702cf 100644 > --- a/drivers/pci/controller/dwc/pcie-designware-ep.c > +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c > @@ -551,7 +551,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no, > } > > aligned_offset = msg_addr & (epc->mem->window.page_size - 1); > - msg_addr &= ~aligned_offset; > + msg_addr = ALIGN_DOWN(msg_addr, epc->mem->window.page_size); > ret = dw_pcie_ep_map_addr(epc, func_no, 0, ep->msi_mem_phys, msg_addr, > epc->mem->window.page_size); > if (ret) Hi Dan, You should also add the include for it: #include <linux/align.h>
On Wed, Jan 24, 2024 at 06:01:42PM +0300, Dan Carpenter wrote: > The "msg_addr" variable is u64. However, the "aligned_offset" is an > unsigned int. This means that when the code does: > > msg_addr &= ~aligned_offset; > > it will unintentionally zero out the high 32 bits. Use ALIGN_DOWN() > to do the alignment instead. > > Cc: stable@vger.kernel.org > Fixes: 2217fffcd63f ("PCI: dwc: endpoint: Fix dw_pcie_ep_raise_msix_irq() alignment support") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > Reviewed-by: Niklas Cassel <cassel@kernel.org> > --- > v4: Add stable and r-b from Niklas > v3: Use ALIGN_DOWN() > v2: fix typo in commit message > > drivers/pci/controller/dwc/pcie-designware-ep.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c > index 5befed2dc02b..51679c6702cf 100644 > --- a/drivers/pci/controller/dwc/pcie-designware-ep.c > +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c > @@ -551,7 +551,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no, > } > > aligned_offset = msg_addr & (epc->mem->window.page_size - 1); > - msg_addr &= ~aligned_offset; > + msg_addr = ALIGN_DOWN(msg_addr, epc->mem->window.page_size); > ret = dw_pcie_ep_map_addr(epc, func_no, 0, ep->msi_mem_phys, msg_addr, > epc->mem->window.page_size); > if (ret) > -- > 2.43.0 >
diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c index 5befed2dc02b..51679c6702cf 100644 --- a/drivers/pci/controller/dwc/pcie-designware-ep.c +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c @@ -551,7 +551,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no, } aligned_offset = msg_addr & (epc->mem->window.page_size - 1); - msg_addr &= ~aligned_offset; + msg_addr = ALIGN_DOWN(msg_addr, epc->mem->window.page_size); ret = dw_pcie_ep_map_addr(epc, func_no, 0, ep->msi_mem_phys, msg_addr, epc->mem->window.page_size); if (ret)