PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Subsystems (4)
Wei Liu
maintainerPATCH v3 1/1 PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
The intent of the code snippet is to always return 0 for both PCI_INTERRUPT_LINE and PCI_INTERRUPT_PIN.
The check misses PCI_INTERRUPT_PIN. This patch fixes that.
This is discovered by this call in VFIO:
pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);
The old code does not set *val to 0 because it misses the check for PCI_INTERRUPT_PIN. Garbage is returned in that case.
---
v3:
* Change commit subject line and message per Bjorn's suggestion v2:
* Change the commit subject line and message
* Change the code according to feedback
--- drivers/pci/controller/pci-hyperv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-hyperv.c +2 -2
@@ -1130,8 +1130,8 @@ static void _hv_pcifront_read_config(struct hv_pci_dev *hpdev, int where, PCI_CAPABILITY_LIST) {/* ROM BARs are unimplemented */ *val =0 ; - } else if (where >= PCI_INTERRUPT_LINE && where + size <= - PCI_INTERRUPT_PIN) { + } else if ((where >= PCI_INTERRUPT_LINE && where + size <= PCI_INTERRUPT_PIN) || + (where >= PCI_INTERRUPT_PIN && where + size <= PCI_MIN_GNT)) {/* * Interrupt Line and Interrupt PIN are hard-wired to zero * because this front-end only supports message-signaled
Signature · 1 line
2.43.0
Wei Liu
maintainerQuoted 9 lines · Wei Liu
The intent of the code snippet is to always return 0 for both
PCI_INTERRUPT_LINEandPCI_INTERRUPT_PIN.The check misses
PCI_INTERRUPT_PIN. This patch fixes that.This is discovered by this call in VFIO:
pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);
Quoted 7 lines
The old code does not set *val to 0 because it misses the check for
PCI_INTERRUPT_PIN. Garbage is returned in that case.Fixes 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs")Signed-off-by Wei Liu <[email protected]>Reviewed-by Michael Kelley <[email protected]>
Bjorn & other PCI maintainers, do you want to pick this up via your tree?
I can pick this up via the hyperv tree if you prefer.
Thanks,
Wei.
Quoted 28 lines
---
v3:
* Change commit subject line and message per Bjorn's suggestion v2:
* Change the commit subject line and message
* Change the code according to feedback--- drivers/pci/controller/pci-hyperv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/pci/controller/pci-hyperv.c +2
-2@@ -1130,8 +1130,8 @@ static void _hv_pcifront_read_config(struct hv_pci_dev *hpdev, int where, PCI_CAPABILITY_LIST) {/* ROM BARs are unimplemented */ *val =0 ; - } else if (where >= PCI_INTERRUPT_LINE && where + size <= - PCI_INTERRUPT_PIN) { + } else if ((where >= PCI_INTERRUPT_LINE && where + size <= PCI_INTERRUPT_PIN) || + (where >= PCI_INTERRUPT_PIN && where + size <= PCI_MIN_GNT)) {/* * Interrupt Line and Interrupt PIN are hard-wired to zero * because this front-end only supports message-signaled Signature · 1 line
2.43.0
Hello,
Quoted 11 lines
Quoted 11 lines
The intent of the code snippet is to always return 0 for both
PCI_INTERRUPT_LINEandPCI_INTERRUPT_PIN.The check misses
PCI_INTERRUPT_PIN. This patch fixes that.This is discovered by this call in VFIO:
pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);The old code does not set *val to 0 because it misses the check for
PCI_INTERRUPT_PIN. Garbage is returned in that case.
[...]
Quoted 5 lines
Bjorn & other PCI maintainers, do you want to pick this up via your tree?
I can pick this up via the hyperv tree if you prefer.
We will pick this up. No worries.
Krzysztof
Wei Liu
maintainerQuoted 13 lines · Krzysztof Wilczyński
Hello,
Quoted 11 lines
Quoted 11 lines
The intent of the code snippet is to always return 0 for both
PCI_INTERRUPT_LINEandPCI_INTERRUPT_PIN.The check misses
PCI_INTERRUPT_PIN. This patch fixes that.This is discovered by this call in VFIO:
pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);The old code does not set *val to 0 because it misses the check for
PCI_INTERRUPT_PIN. Garbage is returned in that case.
Quoted 8 lines
[...]
Quoted 5 lines
Bjorn & other PCI maintainers, do you want to pick this up via your tree?
I can pick this up via the hyperv tree if you prefer.
We will pick this up. No worries.
Thank you very much!
Quoted 3 lines
Krzysztof
Krzysztof Wilczyński
AppliedHello,
Quoted 11 lines
The intent of the code snippet is to always return 0 for both
PCI_INTERRUPT_LINEandPCI_INTERRUPT_PIN.The check misses
PCI_INTERRUPT_PIN. This patch fixes that.This is discovered by this call in VFIO:
pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);The old code does not set *val to 0 because it misses the check for
PCI_INTERRUPT_PIN. Garbage is returned in that case.
Applied to controller/hyperv, thank you!
[1/1] PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
https://git.kernel.org/pci/pci/c/fea93a3e5d5e Krzysztof