Skip to content

Commit

Permalink
vdpa: solidrun: Fix UB bug with devres
Browse files Browse the repository at this point in the history
In psnet_open_pf_bar() and snet_open_vf_bar() a string later passed to
pcim_iomap_regions() is placed on the stack. Neither
pcim_iomap_regions() nor the functions it calls copy that string.

Should the string later ever be used, this, consequently, causes
undefined behavior since the stack frame will by then have disappeared.

Fix the bug by allocating the strings on the heap through
devm_kasprintf().

Cc: [email protected]	# v6.3
Fixes: 51a8f9d ("virtio: vdpa: new SolidNET DPU driver.")
Reported-by: Christophe JAILLET <[email protected]>
Closes: https://lore.kernel.org/all/[email protected]/
Suggested-by: Andy Shevchenko <[email protected]>
Signed-off-by: Philipp Stanner <[email protected]>
Reviewed-by: Stefano Garzarella <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
  • Loading branch information
Philipp Stanner authored and mstsirkin committed Nov 6, 2024
1 parent 6ca5753 commit 0b364cf
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions drivers/vdpa/solidrun/snet_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ 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];
char *name;
int ret, i, mask = 0;
/* We don't know which BAR will be used to communicate..
* We will map every bar with len > 0.
Expand All @@ -573,7 +573,10 @@ static int psnet_open_pf_bar(struct pci_dev *pdev, struct psnet *psnet)
return -ENODEV;
}

snprintf(name, sizeof(name), "psnet[%s]-bars", pci_name(pdev));
name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "psnet[%s]-bars", pci_name(pdev));
if (!name)
return -ENOMEM;

ret = pcim_iomap_regions(pdev, mask, name);
if (ret) {
SNET_ERR(pdev, "Failed to request and map PCI BARs\n");
Expand All @@ -590,10 +593,13 @@ 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];
char *name;
int ret;

snprintf(name, sizeof(name), "snet[%s]-bar", pci_name(pdev));
name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "snet[%s]-bars", pci_name(pdev));
if (!name)
return -ENOMEM;

/* Request and map BAR */
ret = pcim_iomap_regions(pdev, BIT(snet->psnet->cfg.vf_bar), name);
if (ret) {
Expand Down

0 comments on commit 0b364cf

Please sign in to comment.