PCI/P2PDMA: Fix undefined behavior bug in struct pci_p2pdma_pagemap
Subsystems (2)
PATCH 1/1 PCI/P2PDMA: Fix undefined behavior bug in struct pci_p2pdma_pagemap
struct dev_pagemap is a flexible structure, which means that it contains a flexible-array member at the bottom. This could potentially lead to an overwrite of the objects following pgmap in struct pci_p2pdma_pagemap, when nr_range > 1.
Fix this by placing the declaration of object pgmap at the end of struct pci_p2pdma_pagemap.
-Wflex-array-member-not-at-end is coming in GCC-14, and we are getting ready to enable it globally.
--- drivers/pci/p2pdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/p2pdma.c +1 -1
@@ -28,9 +28,9 @@ struct pci_p2pdma { };struct pci_p2pdma_pagemap { -struct dev_pagemap pgmap;struct pci_dev *provider;u64 bus_offset; +struct dev_pagemap pgmap; };static struct pci_p2pdma_pagemap *to_p2p_pgmap (struct dev_pagemap *pgmap)
Signature · 1 line
2.34.1
Quoted 8 lines · Gustavo A. R. Silva
struct dev_pagemapis a flexible structure, which means that it contains a flexible-array member at the bottom. This could potentially lead to an overwrite of the objects followingpgmapinstruct pci_p2pdma_pagemap, whennr_range > 1.Fix this by placing the declaration of object
pgmapat the end ofstruct pci_p2pdma_pagemap.
Quoted 7 lines
-Wflex-array-member-not-at-end is coming in GCC-14, and we are getting ready to enable it globally.
Fixes 0afea3814358 ("PCI/P2PDMA: Add provider's pci_dev to pci_p2pdma_pagemap struct")Fixes a6e6fe6549f6 ("PCI/P2PDMA: Introduce private pagemap structure")Signed-off-by Gustavo A. R. Silva <[email protected]>
Makes sense to me, thanks.
Although, I'm not sure the fixes tags are appropriate. The flexible-array member was introduced in 5.10 (b7b3c01b19) and both the "fixed" commits predate that change by a number of releases.
Also, it's probably worth noting in the commit message that the p2pdma code hardcodes nr_ranges to 1 (in pci_p2pdma_add_resource); so there is no way to actually hit any bug with the current code.
I totally agree that the patch should be applied to prevent possible bugs being introduced in the future:
Logan
Quoted 20 lines · Logan Gunthorpe
Quoted 8 lines · Gustavo A. R. Silva
struct dev_pagemapis a flexible structure, which means that it contains a flexible-array member at the bottom. This could potentially lead to an overwrite of the objects followingpgmapinstruct pci_p2pdma_pagemap, whennr_range > 1.Fix this by placing the declaration of object
pgmapat the end ofstruct pci_p2pdma_pagemap.Quoted 7 lines
-Wflex-array-member-not-at-end is coming in GCC-14, and we are getting ready to enable it globally.
Fixes 0afea3814358 ("PCI/P2PDMA: Add provider's pci_dev to pci_p2pdma_pagemap struct")Fixes a6e6fe6549f6 ("PCI/P2PDMA: Introduce private pagemap structure")Signed-off-by Gustavo A. R. Silva <[email protected]>
Quoted 5 lines
Makes sense to me, thanks.
Although, I'm not sure the fixes tags are appropriate. The flexible-array member was introduced in 5.10 (
b7b3c01b19) and both the "fixed" commits predate that change by a number of releases.
You're right. I'll remove those tags.
Quoted 4 lines
Also, it's probably worth noting in the commit message that the p2pdma code hardcodes
nr_rangesto 1 (inpci_p2pdma_add_resource); so there is no way to actually hit any bug with the current code.
Yep. I mention that in this part "This could potentially lead to an overwrite of the objects following pgmap in struct pci_p2pdma_pagemap, when nr_range > 1."
Quoted 5 lines
I totally agree that the patch should be applied to prevent possible bugs being introduced in the future:
Reviewed-by Logan Gunthorpe <[email protected]>
Thanks for the RB and the feedback. :)
--
Gustavo
Logan Gunthorpe
maintainerQuoted 32 lines · Gustavo A. R. Silva
Quoted 20 lines · Logan Gunthorpe
Quoted 8 lines · Gustavo A. R. Silva
struct dev_pagemapis a flexible structure, which means that it contains a flexible-array member at the bottom. This could potentially lead to an overwrite of the objects followingpgmapinstruct pci_p2pdma_pagemap, whennr_range > 1.Fix this by placing the declaration of object
pgmapat the end ofstruct pci_p2pdma_pagemap.Quoted 7 lines
-Wflex-array-member-not-at-end is coming in GCC-14, and we are getting ready to enable it globally.
Fixes 0afea3814358 ("PCI/P2PDMA: Add provider's pci_dev to pci_p2pdma_pagemap struct")Fixes a6e6fe6549f6 ("PCI/P2PDMA: Introduce private pagemap structure")Signed-off-by Gustavo A. R. Silva <[email protected]>Quoted 5 lines
Makes sense to me, thanks.
Although, I'm not sure the fixes tags are appropriate. The flexible-array member was introduced in 5.10 (
b7b3c01b19) and both the "fixed" commits predate that change by a number of releases.You're right. I'll remove those tags.
Quoted 1 line
Quoted 7 lines
Quoted 3 lines
Also, it's probably worth noting in the commit message that the p2pdma code hardcodes
nr_rangesto 1 (inpci_p2pdma_add_resource); so there is no way to actually hit any bug with the current code.Yep. I mention that in this part "This could potentially lead to an overwrite of the objects following
pgmapinstruct pci_p2pdma_pagemap, whennr_range > 1."
Yes, but the commit message is not clear that nr_range can never be >1 in the code as it currently is.
Logan
Quoted 4 lines
Yes, but the commit message is not clear that
nr_rangecan never be >1 in the code as it currently is.
Done:
https://lore.kernel.org/linux-hardening/ZRsUL%2FhATNruwtla@work/
Thanks!
--
Gustavo