| Message ID | 1448377685-7515-1-git-send-email-prarit@redhat.com |
|---|---|
| State | Not Applicable |
| Headers | show |
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 9261868..6e98182 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -216,7 +216,10 @@ static ssize_t numa_node_store(struct device *dev, if (ret) return ret; - if (node >= MAX_NUMNODES || !node_online(node)) + if (node < NUMA_NO_NODE || node >= MAX_NUMNODES) + return -EINVAL; + + if (node != NUMA_NO_NODE && !node_online(node)) return -EINVAL; add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
Suggested here: http://marc.info/?l=linux-pci&m=144706760307247&w=2 P. -----8<----- The fix for 1266963 ("PCI: Prevent out of bounds access in numa_node override") should allow for the setting of all valid NUMA states including NUMA_NO_NODE, which is also interpreted as "any node". This change splits the test into a range check, and then a separate check to see if the node is online. Fixes: 1266963 ("PCI: Prevent out of bounds access in numa_node override") Cc: Sasha Levin <sasha.levin@oracle.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: stable@vger.kernel.org Signed-off-by: Prarit Bhargava <prarit@redhat.com> --- drivers/pci/pci-sysfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)