lkml.org 
[lkml]   [2014]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 042/128] PCI: Fix incorrect vgaarb conditional in WARN_ON()
    Date
    3.11.10.14 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bjorn Helgaas <bhelgaas@google.com>

    commit 67ebd8140dc8923c65451fa0f6a8eee003c4dcd3 upstream.

    3448a19da479 "vgaarb: use bridges to control VGA routing where possible"
    added the "flags & PCI_VGA_STATE_CHANGE_DECODES" condition to an existing
    WARN_ON(), but used bitwise AND (&) instead of logical AND (&&), so the
    condition is never true. Replace with logical AND.

    Found by Coverity (CID 142811).

    Fixes: 3448a19da479 "vgaarb: use bridges to control VGA routing where possible"
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Acked-by: Yinghai Lu <yinghai@kernel.org>
    Acked-by: David Airlie <airlied@redhat.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/pci/pci.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
    index b5352fcf5df7..b25b53e41a7e 100644
    --- a/drivers/pci/pci.c
    +++ b/drivers/pci/pci.c
    @@ -3669,7 +3669,7 @@ int pci_set_vga_state(struct pci_dev *dev, bool decode,
    u16 cmd;
    int rc;

    - WARN_ON((flags & PCI_VGA_STATE_CHANGE_DECODES) & (command_bits & ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY)));
    + WARN_ON((flags & PCI_VGA_STATE_CHANGE_DECODES) && (command_bits & ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY)));

    /* ARCH specific VGA enables */
    rc = pci_set_vga_state_arch(dev, decode, command_bits, flags);
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-25 03:01    [W:4.550 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site