summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-30 18:47:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-30 18:47:18 -0700
commitf9793e379bbb1188c72d8a367083290a14f98c97 (patch)
tree6c66a198f7ef0c8420b55c3519562c85012ff6bb /drivers/pci
parent9b971e771ece3f3fa9c6074e5a12d9304e5fa9ef (diff)
parent1266963170f576d4d08e6310b6963e26d3ff9d1e (diff)
downloadop-kernel-dev-f9793e379bbb1188c72d8a367083290a14f98c97.zip
op-kernel-dev-f9793e379bbb1188c72d8a367083290a14f98c97.tar.gz
Merge tag 'pci-v4.3-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas: "Sorry for this last-minute update; it's been in -next for quite a while, but I forgot about it until I started getting ready for the merge window. It's small and fixes a way a user could cause a panic via sysfs, so I think it's worth getting it in v4.3. NUMA: - Prevent out of bounds access in sysfs numa_node override (Sasha Levin)" * tag 'pci-v4.3-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: Prevent out of bounds access in numa_node override
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci-sysfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 312f23a..9261868 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -216,7 +216,7 @@ static ssize_t numa_node_store(struct device *dev,
if (ret)
return ret;
- if (!node_online(node))
+ if (node >= MAX_NUMNODES || !node_online(node))
return -EINVAL;
add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
OpenPOWER on IntegriCloud