public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: Ding Hui <dinghui@sangfor.com.cn>
Cc: bhelgaas@google.com, sathyanarayanan.kuppuswamy@linux.intel.com,
	vidyas@nvidia.com, david.e.box@linux.intel.com,
	kai.heng.feng@canonical.com, michael.a.bottini@linux.intel.com,
	rajatja@google.com, qinzongquan@sangfor.com.cn,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] PCI/ASPM: fix UAF by disable ASPM for link when child function is removed
Date: Fri, 5 May 2023 15:58:45 -0500	[thread overview]
Message-ID: <20230505205845.GA978671@bhelgaas> (raw)
In-Reply-To: <20230504123418.4438-1-dinghui@sangfor.com.cn>

On Thu, May 04, 2023 at 08:34:18PM +0800, Ding Hui wrote:
> If the Function 0 of a Multi-Function device is software removed,
> a freed downstream pointer will be left in struct pcie_link_state,
> and then when pcie_config_aspm_link() be invoked from any path,
> we will trigger use-after-free.
> 
> Based on the PCIe spec about ASPM Control (PCIe r6.0, sec 7.5.3.7),
> for Multi-Function Devices (including ARI Devices), it is recommended
> that software program the same value in all Functions. For ARI
> Devices, ASPM Control is determined solely by the setting in Function 0.
> 
> So we can just disable ASPM of the whole component if any child
> function is removed, the downstream pointer will be avoided from
> use-after-free, that will also avoid other potential corner cases.
> 
> Fixes: b5a0a9b59c81 ("PCI/ASPM: Read and set up L1 substate capabilities")
> Debugged-by: Zongquan Qin <qinzongquan@sangfor.com.cn>
> Suggestion-by: Bjorn Helgaas <bhelgaas@google.com>
> Signed-off-by: Ding Hui <dinghui@sangfor.com.cn>
> ---
>  drivers/pci/pcie/aspm.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
> index 66d7514ca111..1bf8306141aa 100644
> --- a/drivers/pci/pcie/aspm.c
> +++ b/drivers/pci/pcie/aspm.c
> @@ -1010,18 +1010,17 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)

Not directly related to your patch, but this looks racy to me:

  void pcie_aspm_exit_link_state(struct pci_dev *pdev)
  {
    struct pci_dev *parent = pdev->bus->self;

    if (!parent || !parent->link_state)
      return;

    down_read(&pci_bus_sem);
    mutex_lock(&aspm_lock);

    link = parent->link_state;
    root = link->root;
    ...
    free_link_state(link);
      link->pdev->link_state = NULL;
      kfree(link);

Since we check "parent->link_state" before acquiring the locks, I
suspect that removing two functions at the same time could end up with
a NULL pointer dereference:

  pcie_aspm_exit_link_state(fn 0)    pcie_aspm_exit_link_state(fn 1)
  parent = X                         parent = X
  parent->link_state != NULL         parent->link_state != NULL

  acquire locks
  free_link_state(link)
  link->pdev->link_state = NULL # aka parent->link_state
  kfree(link)
  release locks

                                     acquire locks
                                     link = parent->link_state # now NULL
                                     root = link->root         # NULL ptr

What do you think?  I guess if this *is* a race, it should be fixed by
a separate patch.

>  	down_read(&pci_bus_sem);
>  	mutex_lock(&aspm_lock);
> -	/*
> -	 * All PCIe functions are in one slot, remove one function will remove
> -	 * the whole slot, so just wait until we are the last function left.
> -	 */
> -	if (!list_empty(&parent->subordinate->devices))
> -		goto out;
>  
>  	link = parent->link_state;
>  	root = link->root;
>  	parent_link = link->parent;
>  
> -	/* All functions are removed, so just disable ASPM for the link */
> +	/*
> +	 * Any function is removed (including software removing), just
> +	 * disable ASPM for the link, in case we can not configure the same
> +	 * setting for all functions.
> +	 * See PCIe r6.0, sec 7.5.3.7.
> +	 */
>  	pcie_config_aspm_link(link, 0);
>  	list_del(&link->sibling);
>  	/* Clock PM is for endpoint device */
> @@ -1032,7 +1031,7 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
>  		pcie_update_aspm_capable(root);
>  		pcie_config_aspm_path(parent_link);
>  	}
> -out:
> +
>  	mutex_unlock(&aspm_lock);
>  	up_read(&pci_bus_sem);
>  }
> -- 
> 2.17.1
> 

  parent reply	other threads:[~2023-05-05 20:58 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-04 12:34 [PATCH] PCI/ASPM: fix UAF by disable ASPM for link when child function is removed Ding Hui
2023-05-05  2:51 ` Sathyanarayanan Kuppuswamy
2023-05-05  4:40   ` Ding Hui
2023-05-05 20:58 ` Bjorn Helgaas [this message]
2023-05-06  0:44   ` Ding Hui

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230505205845.GA978671@bhelgaas \
    --to=helgaas@kernel.org \
    --cc=bhelgaas@google.com \
    --cc=david.e.box@linux.intel.com \
    --cc=dinghui@sangfor.com.cn \
    --cc=kai.heng.feng@canonical.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=michael.a.bottini@linux.intel.com \
    --cc=qinzongquan@sangfor.com.cn \
    --cc=rajatja@google.com \
    --cc=sathyanarayanan.kuppuswamy@linux.intel.com \
    --cc=vidyas@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox