Skip to content

Commit 3dcc8d3

Browse files
miniplibjorn-helgaas
authored andcommitted
PCI: Prevent out of bounds access in numa_node override
Commit 1266963 ("PCI: Prevent out of bounds access in numa_node override") missed that the user-provided node could also be negative. Handle this case as well to avoid out-of-bounds accesses to the node_states[] array. However, allow the special value -1, i.e. NUMA_NO_NODE, to be able to set the 'no specific node' configuration. Fixes: 1266963 ("PCI: Prevent out of bounds access in numa_node override") Fixes: 63692df ("PCI: Allow numa_node override via sysfs") Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Sasha Levin <sasha.levin@oracle.com> CC: Prarit Bhargava <prarit@redhat.com> CC: stable@vger.kernel.org # v3.19+
1 parent 1ec2183 commit 3dcc8d3

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/pci/pci-sysfs.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,10 @@ static ssize_t numa_node_store(struct device *dev,
216216
if (ret)
217217
return ret;
218218

219-
if (node >= MAX_NUMNODES || !node_online(node))
219+
if ((node < 0 && node != NUMA_NO_NODE) || node >= MAX_NUMNODES)
220+
return -EINVAL;
221+
222+
if (node != NUMA_NO_NODE && !node_online(node))
220223
return -EINVAL;
221224

222225
add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);

0 commit comments

Comments
 (0)