| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <74e9109a-ac59-49e2-9b1d-d825c9c9f891@wanadoo.fr>
Date: Mon, 19 Aug 2024 20:19:28 +0200
From: Christophe JAILLET <christophe.jaillet@...adoo.fr>
To: Philipp Stanner <pstanner@...hat.com>, onathan Corbet <corbet@....net>,
Jens Axboe <axboe@...nel.dk>, Wu Hao <hao.wu@...el.com>,
Tom Rix <trix@...hat.com>, Moritz Fischer <mdf@...nel.org>,
Xu Yilun <yilun.xu@...el.com>, Andy Shevchenko <andy@...nel.org>,
Linus Walleij <linus.walleij@...aro.org>, Bartosz Golaszewski
<brgl@...ev.pl>, "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Alexandre Torgue <alexandre.torgue@...s.st.com>,
Jose Abreu <joabreu@...opsys.com>,
Maxime Coquelin <mcoquelin.stm32@...il.com>,
Bjorn Helgaas <bhelgaas@...gle.com>,
Alvaro Karsz <alvaro.karsz@...id-run.com>,
"Michael S. Tsirkin" <mst@...hat.com>, Jason Wang <jasowang@...hat.com>,
Xuan Zhuo <xuanzhuo@...ux.alibaba.com>, Eugenio Pérez
<eperezma@...hat.com>, Richard Cochran <richardcochran@...il.com>,
Mark Brown <broonie@...nel.org>
Cc: linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-block@...r.kernel.org, linux-fpga@...r.kernel.org,
linux-gpio@...r.kernel.org, netdev@...r.kernel.org,
linux-stm32@...md-mailman.stormreply.com,
linux-arm-kernel@...ts.infradead.org, linux-pci@...r.kernel.org,
virtualization@...ts.linux.dev
Subject: Re: [PATCH 8/9] vdap: solidrun: Replace deprecated PCI functions
Le 19/08/2024 à 18:51, Philipp Stanner a écrit :
> solidrun utilizes pcim_iomap_regions(), which has been deprecated by the
> PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate
> pcim_iomap_table(), pcim_iomap_regions_request_all()"), among other
> things because it forces usage of quite a complicated bitmask mechanism.
> The bitmask handling code can entirely be removed by replacing
> pcim_iomap_regions() and pcim_iomap_table().
>
> Replace pcim_iomap_regions() and pcim_iomap_table() with
> pci_iomap_region().
>
> Signed-off-by: Philipp Stanner <pstanner@...hat.com>
> ---
> drivers/vdpa/solidrun/snet_main.c | 47 +++++++++++--------------------
> 1 file changed, 16 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/vdpa/solidrun/snet_main.c b/drivers/vdpa/solidrun/snet_main.c
> index 99428a04068d..abf027ca35e1 100644
> --- a/drivers/vdpa/solidrun/snet_main.c
> +++ b/drivers/vdpa/solidrun/snet_main.c
> @@ -556,33 +556,24 @@ static const struct vdpa_config_ops snet_config_ops = {
> static int psnet_open_pf_bar(struct pci_dev *pdev, struct psnet *psnet)
> {
> char name[50];
> - int ret, i, mask = 0;
> + int i;
> +
> + snprintf(name, sizeof(name), "psnet[%s]-bars", pci_name(pdev));
> +
> /* We don't know which BAR will be used to communicate..
> * We will map every bar with len > 0.
> *
> * Later, we will discover the BAR and unmap all other BARs.
> */
> for (i = 0; i < PCI_STD_NUM_BARS; i++) {
> - if (pci_resource_len(pdev, i))
> - mask |= (1 << i);
> - }
> -
> - /* No BAR can be used.. */
> - if (!mask) {
> - SNET_ERR(pdev, "Failed to find a PCI BAR\n");
> - return -ENODEV;
> - }
> -
> - snprintf(name, sizeof(name), "psnet[%s]-bars", pci_name(pdev));
> - ret = pcim_iomap_regions(pdev, mask, name);
> - if (ret) {
> - SNET_ERR(pdev, "Failed to request and map PCI BARs\n");
> - return ret;
> - }
> + if (pci_resource_len(pdev, i)) {
> + psnet->bars[i] = pcim_iomap_region(pdev, i, name);
Hi,
Unrelated to the patch, but is is safe to have 'name' be on the stack?
pcim_iomap_region()
--> __pcim_request_region()
--> __pcim_request_region_range()
--> request_region() or __request_mem_region()
--> __request_region()
--> __request_region_locked()
--> res->name = name;
So an address on the stack ends in the 'name' field of a "struct resource".
According to a few grep, it looks really unusual.
I don't know if it is used, but it looks strange to me.
If it is an issue, it was apparently already there before this patch.
> + if (IS_ERR(psnet->bars[i])) {
> + SNET_ERR(pdev, "Failed to request and map PCI BARs\n");
> + return PTR_ERR(psnet->bars[i]);
> + }
> + }
>
> - for (i = 0; i < PCI_STD_NUM_BARS; i++) {
> - if (mask & (1 << i))
> - psnet->bars[i] = pcim_iomap_table(pdev)[i];
> }
>
> return 0;
> @@ -591,18 +582,15 @@ static int psnet_open_pf_bar(struct pci_dev *pdev, struct psnet *psnet)
> static int snet_open_vf_bar(struct pci_dev *pdev, struct snet *snet)
> {
> char name[50];
> - int ret;
>
> snprintf(name, sizeof(name), "snet[%s]-bar", pci_name(pdev));
> /* Request and map BAR */
> - ret = pcim_iomap_regions(pdev, BIT(snet->psnet->cfg.vf_bar), name);
> - if (ret) {
> + snet->bar = pcim_iomap_region(pdev, snet->psnet->cfg.vf_bar, name);
Same
Just my 2c.
CJ
> + if (IS_ERR(snet->bar)) {
> SNET_ERR(pdev, "Failed to request and map PCI BAR for a VF\n");
> - return ret;
> + return PTR_ERR(snet->bar);
> }
>
> - snet->bar = pcim_iomap_table(pdev)[snet->psnet->cfg.vf_bar];
> -
> return 0;
> }
>
> @@ -650,15 +638,12 @@ static int psnet_detect_bar(struct psnet *psnet, u32 off)
>
> static void psnet_unmap_unused_bars(struct pci_dev *pdev, struct psnet *psnet)
> {
> - int i, mask = 0;
> + int i;
>
> for (i = 0; i < PCI_STD_NUM_BARS; i++) {
> if (psnet->bars[i] && i != psnet->barno)
> - mask |= (1 << i);
> + pcim_iounmap_region(pdev, i);
> }
> -
> - if (mask)
> - pcim_iounmap_regions(pdev, mask);
> }
>
> /* Read SNET config from PCI BAR */
Powered by blists - more mailing lists