lkml.org 
[lkml]   [2016]   [Feb]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf/x86/intel/uncore: Add sanity checks for PCI dev package id
    Commit-ID:  83f8ebd2eb459b21e8e74d43c75e1be666ec8b97
    Gitweb: http://git.kernel.org/tip/83f8ebd2eb459b21e8e74d43c75e1be666ec8b97
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Mon, 22 Feb 2016 22:19:10 +0000
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Mon, 29 Feb 2016 09:35:14 +0100

    perf/x86/intel/uncore: Add sanity checks for PCI dev package id

    The storage array is size limited, but misses a sanity check

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Cc: Andi Kleen <andi.kleen@intel.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Harish Chegondi <harish.chegondi@intel.com>
    Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Kan Liang <kan.liang@intel.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Vince Weaver <vincent.weaver@maine.edu>
    Cc: linux-kernel@vger.kernel.org
    Link: http://lkml.kernel.org/r/20160222221010.929967806@linutronix.de
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/events/intel/uncore.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
    index 25e6203..42ea435 100644
    --- a/arch/x86/events/intel/uncore.c
    +++ b/arch/x86/events/intel/uncore.c
    @@ -882,7 +882,7 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id
    int phys_id, ret;

    phys_id = uncore_pcibus_to_physid(pdev->bus);
    - if (phys_id < 0)
    + if (phys_id < 0 || phys_id >= UNCORE_SOCKET_MAX)
    return -ENODEV;

    if (UNCORE_PCI_DEV_TYPE(id->driver_data) == UNCORE_EXTRA_PCI_DEV) {
    \
     
     \ /
      Last update: 2016-02-29 12:41    [W:5.838 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site