linux-kernel - Re: [PATCH] pci: Fix unaligned access testing AF transaction pending

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20140617214709.GA30559@google.com>
Date:	Tue, 17 Jun 2014 15:47:09 -0600
From:	Bjorn Helgaas <bhelgaas@...gle.com>
To:	Alex Williamson <alex.williamson@...hat.com>
Cc:	linux-pci@...r.kernel.org, ben@...adent.org.uk,
	gwshan@...ux.vnet.ibm.com, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] pci: Fix unaligned access testing AF transaction pending

On Thu, Jun 12, 2014 at 09:28:07AM -0600, Alex Williamson wrote:
> pci_wait_for_pending() uses word access, so we shouldn't be passing
> an offset that is only byte aligned.  Use the control register offset
> instead, shifting the mask to match.
> 
> Signed-off-by: Alex Williamson <alex.williamson@...hat.com>
> Reported-by: Ben Hutchings <ben@...adent.org.uk>
> Cc: stable@...r.kernel.org

Applied with Gavin's ack to for-linus for v3.16, thanks!

> ---
>  drivers/pci/pci.c |    9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 759475e..81012ec 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -3109,8 +3109,13 @@ static int pci_af_flr(struct pci_dev *dev, int probe)
>  	if (probe)
>  		return 0;
>  
> -	/* Wait for Transaction Pending bit clean */
> -	if (pci_wait_for_pending(dev, pos + PCI_AF_STATUS, PCI_AF_STATUS_TP))
> +	/*
> +	 * Wait for Transaction Pending bit to clear.  A word-aligned test
> +	 * is used, so we use the conrol offset rather than status and shift
> +	 * the test bit to match.
> +	 */
> +	if (pci_wait_for_pending(dev, pos + PCI_AF_CTRL,
> +				 PCI_AF_STATUS_TP << 8))
>  		goto clear;
>  
>  	dev_err(&dev->dev, "transaction is not cleared; "
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/