pci: Common overflow prevention
PATCH 1/1 pci: Common overflow prevention
Introduce pci_config_read/write_common helpers to prevent passing accesses down the callback chain that go beyond the config space limits. Adjust length assertions as they are no longer correct (cutting may generate valid 3 byte accesses).
---
Now I have to deal with 3 byte config space access for device assignment, but Michael was right, such things are possible, even in PCIe.
hw/pci.c | 6 ++---- hw/pci_host.c | 24 ++++++++++++++++++++---- hw/pci_host.h | 6 ++++++ hw/pcie_host.c | 12 ++++++------ 4 files changed, 34 insertions(+), 14 deletions(-)
hw/pci.c +2 -4
@@ -1108,8 +1108,7 @@ uint32_t pci_default_read_config(PCIDevice *d, uint32_t address, int len) {uint32_t val =0 ; -assert (len ==1 || len ==2 || len ==4 ); - len =MIN (len,pci_config_size (d) - address); +memcpy (&val, d->config + address, len);return le32_to_cpu (val); }
@@ -1117,9 +1116,8 @@ uint32_t pci_default_read_config(PCIDevice *d,void pci_default_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int l) {int i, was_irq_disabled =pci_irq_disabled (d); -uint32_t config_size =pci_config_size (d); -for (i =0 ; i < l && addr + i < config_size; val >>=8 , ++i) { +for (i =0 ; i < l; val >>=8 , ++i) {uint8_t wmask = d->wmask[addr + i];uint8_t w1cmask = d->w1cmask[addr + i];assert (!(wmask & w1cmask));
hw/pci_host.c +20 -4
@@ -47,17 +47,33 @@ static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr)return pci_find_device (bus, bus_num, devfn); } +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t val,uint32_t len) +{ +assert (len <=4 ); + pci_dev->config_write (pci_dev, addr, val,MIN (len, limit - addr)); +} + +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t len) +{ +assert (len <=4 ); +return pci_dev->config_read (pci_dev, addr,MIN (len, limit - addr)); +} +void pci_data_write (PCIBus *s,uint32_t addr,uint32_t val,int len) {PCIDevice *pci_dev =pci_dev_find_by_addr (s, addr);uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE -1 ); -if (!pci_dev) +if (!pci_dev) {return ; + }PCI_DPRINTF ("%s: %s: addr=%02" PRIx32" val=%08" PRIx32" len=%d\n" , __func__, pci_dev->name, config_addr, val, len); - pci_dev->config_write (pci_dev, config_addr, val, len); +pci_config_write_common (pci_dev, config_addr,PCI_CONFIG_SPACE_SIZE , val, + len); }uint32_t pci_data_read (PCIBus *s,uint32_t addr,int len)
@@ -66,12 +82,12 @@ uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len)uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE -1 );uint32_t val; -assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } - val = pci_dev->config_read (pci_dev, config_addr, len); + val =pci_config_read_common (pci_dev, config_addr,PCI_CONFIG_SPACE_SIZE , + len);PCI_DPRINTF ("%s: %s: addr=%02" PRIx32" val=%08" PRIx32" len=%d\n" , __func__, pci_dev->name, config_addr, val, len);
hw/pci_host.h +6 -0
@@ -39,6 +39,12 @@ struct PCIHostState {PCIBus *bus; }; +/* common internal helpers for PCI/PCIe hosts, cut off overflows */ +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t addr_mask,uint32_t val,uint32_t len); +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t addr_mask,uint32_t len); +void pci_data_write (PCIBus *s,uint32_t addr,uint32_t val,int len);uint32_t pci_data_read (PCIBus *s,uint32_t addr,int len);
hw/pcie_host.c +6 -6
@@ -57,22 +57,22 @@ static void pcie_mmcfg_data_write(PCIBus *s, {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, mmcfg_addr); -if (!pci_dev) +if (!pci_dev) {return ; - - pci_dev->config_write (pci_dev, -PCIE_MMCFG_CONFOFFSET (mmcfg_addr), val, len); + } +pci_config_write_common (pci_dev,PCIE_MMCFG_CONFOFFSET (mmcfg_addr), +PCIE_CONFIG_SPACE_SIZE , val, len); }static uint32_t pcie_mmcfg_data_read (PCIBus *s,uint32_t addr,int len) {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, addr); -assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } -return pci_dev->config_read (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), len); +return pci_config_read_common (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), +PCIE_CONFIG_SPACE_SIZE , len); } static void pcie_mmcfg_data_writeb(void *opaque,
Signature · 1 line
1.7.3.4
Quoted 135 lines · Jan Kiszka
Introduce pci_config_read/write_common helpers to prevent passing accesses down the callback chain that go beyond the config space limits. Adjust length assertions as they are no longer correct (cutting may generate valid 3 byte accesses).
Signed-off-by Jan Kiszka <[email protected]>---
Now I have to deal with 3 byte config space access for device assignment, but Michael was right, such things are possible, even in PCIe.
hw/pci.c | 6 ++---- hw/pci_host.c | 24 ++++++++++++++++++++---- hw/pci_host.h | 6 ++++++ hw/pcie_host.c | 12 ++++++------ 4 files changed, 34 insertions(+), 14 deletions(-)hw/pci.c +2
-4@@ -1108,8 +1108,7 @@ uint32_t pci_default_read_config(PCIDevice *d, uint32_t address, int len) {uint32_t val =0 ; -assert (len ==1 || len ==2 || len ==4 ); - len =MIN (len,pci_config_size (d) - address); +memcpy (&val, d->config + address, len);return le32_to_cpu (val); }@@ -1117,9 +1116,8 @@ uint32_t pci_default_read_config(PCIDevice *d,void pci_default_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int l) {int i, was_irq_disabled =pci_irq_disabled (d); -uint32_t config_size =pci_config_size (d); -for (i =0 ; i < l && addr + i < config_size; val >>=8 , ++i) { +for (i =0 ; i < l; val >>=8 , ++i) {uint8_t wmask = d->wmask[addr + i];uint8_t w1cmask = d->w1cmask[addr + i];assert (!(wmask & w1cmask));hw/pci_host.c +20
-4@@ -47,17 +47,33 @@ static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr)return pci_find_device (bus, bus_num, devfn); } +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t val,uint32_t len) +{ +assert (len <=4 ); + pci_dev->config_write (pci_dev, addr, val,MIN (len, limit - addr)); +} + +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t len) +{ +assert (len <=4 ); +return pci_dev->config_read (pci_dev, addr,MIN (len, limit - addr)); +} +void pci_data_write (PCIBus *s,uint32_t addr,uint32_t val,int len) {PCIDevice *pci_dev =pci_dev_find_by_addr (s, addr);uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE -1 ); -if (!pci_dev) +if (!pci_dev) {return ; + }PCI_DPRINTF ("%s: %s: addr=%02" PRIx32" val=%08" PRIx32" len=%d\n" , __func__, pci_dev->name, config_addr, val, len); - pci_dev->config_write (pci_dev, config_addr, val, len); +pci_config_write_common (pci_dev, config_addr,PCI_CONFIG_SPACE_SIZE , val, + len); }uint32_t pci_data_read (PCIBus *s,uint32_t addr,int len)@@ -66,12 +82,12 @@ uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len)uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE -1 );uint32_t val; -assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } - val = pci_dev->config_read (pci_dev, config_addr, len); + val =pci_config_read_common (pci_dev, config_addr,PCI_CONFIG_SPACE_SIZE , + len);PCI_DPRINTF ("%s: %s: addr=%02" PRIx32" val=%08" PRIx32" len=%d\n" , __func__, pci_dev->name, config_addr, val, len);hw/pci_host.h +6
-0@@ -39,6 +39,12 @@ struct PCIHostState {PCIBus *bus; }; +/* common internal helpers for PCI/PCIe hosts, cut off overflows */ +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t addr_mask,uint32_t val,uint32_t len); +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t addr_mask,uint32_t len); +void pci_data_write (PCIBus *s,uint32_t addr,uint32_t val,int len);uint32_t pci_data_read (PCIBus *s,uint32_t addr,int len);hw/pcie_host.c +4
-4@@ -57,22 +57,22 @@ static void pcie_mmcfg_data_write(PCIBus *s, {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, mmcfg_addr); -if (!pci_dev) +if (!pci_dev) {return ; - - pci_dev->config_write (pci_dev, -PCIE_MMCFG_CONFOFFSET (mmcfg_addr), val, len); + } +pci_config_write_common (pci_dev,PCIE_MMCFG_CONFOFFSET (mmcfg_addr), +PCIE_CONFIG_SPACE_SIZE , val, len); }static uint32_t pcie_mmcfg_data_read (PCIBus *s,uint32_t addr,int len)
hw/pcie_host.c static void pcie_mmcfg_data_write(PCIBus *s, · line 75
Quoted 10 lines
hw/pcie_host.c +2
-2{PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, addr); -assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } -return pci_dev->config_read (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), len); +return pci_config_read_common (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), +PCIE_CONFIG_SPACE_SIZE , len);
Doesn't this one need to be pci_config_size(pci_dev)? We can have pci devices on an express root complex or behind an express to pci bridge.
Quoted 5 lines
hw/pcie_host.c +0
-0} static void pcie_mmcfg_data_writeb(void *opaque,Signature · 1 line
1.7.3.4
PATCH v2 1/1 pci: Common overflow prevention
Quoted 23 lines · Michael S. Tsirkin
Quoted 23 lines
hw/pcie_host.c +4
-4@@ -57,22 +57,22 @@ static void pcie_mmcfg_data_write(PCIBus *s, {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, mmcfg_addr); -if (!pci_dev) +if (!pci_dev) {return ; - - pci_dev->config_write (pci_dev, -PCIE_MMCFG_CONFOFFSET (mmcfg_addr), val, len); + } +pci_config_write_common (pci_dev,PCIE_MMCFG_CONFOFFSET (mmcfg_addr), +PCIE_CONFIG_SPACE_SIZE , val, len); }static uint32_t pcie_mmcfg_data_read (PCIBus *s,uint32_t addr,int len) {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, addr);
Quoted 11 lines
hw/pcie_host.c static void pcie_mmcfg_data_write(PCIBus *s, · line 75
Quoted 7 lines
hw/pcie_host.c +2
-2-assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } -return pci_dev->config_read (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), len); +return pci_config_read_common (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), +PCIE_CONFIG_SPACE_SIZE , len);Doesn't this one need to be
pci_config_size(pci_dev)? We can have pci devices on an express root complex or behind an express to pci bridge.
Yep, right.
Thanks,
Jan
------8<------
Introduce pci_config_read/write_common helpers to prevent passing accesses down the callback chain that go beyond the config space limits. Adjust length assertions as they are no longer correct (cutting may generate valid 3 byte accesses).
--- hw/pci.c | 6 ++---- hw/pci_host.c | 24 ++++++++++++++++++++---- hw/pci_host.h | 6 ++++++ hw/pcie_host.c | 12 ++++++------ 4 files changed, 34 insertions(+), 14 deletions(-)
hw/pci.c +2 -4
@@ -1108,8 +1108,7 @@ uint32_t pci_default_read_config(PCIDevice *d, uint32_t address, int len) {uint32_t val =0 ; -assert (len ==1 || len ==2 || len ==4 ); - len =MIN (len,pci_config_size (d) - address); +memcpy (&val, d->config + address, len);return le32_to_cpu (val); }
@@ -1117,9 +1116,8 @@ uint32_t pci_default_read_config(PCIDevice *d,void pci_default_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int l) {int i, was_irq_disabled =pci_irq_disabled (d); -uint32_t config_size =pci_config_size (d); -for (i =0 ; i < l && addr + i < config_size; val >>=8 , ++i) { +for (i =0 ; i < l; val >>=8 , ++i) {uint8_t wmask = d->wmask[addr + i];uint8_t w1cmask = d->w1cmask[addr + i];assert (!(wmask & w1cmask));
hw/pci_host.c +20 -4
@@ -47,17 +47,33 @@ static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr)return pci_find_device (bus, bus_num, devfn); } +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t val,uint32_t len) +{ +assert (len <=4 ); + pci_dev->config_write (pci_dev, addr, val,MIN (len, limit - addr)); +} + +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t len) +{ +assert (len <=4 ); +return pci_dev->config_read (pci_dev, addr,MIN (len, limit - addr)); +} +void pci_data_write (PCIBus *s,uint32_t addr,uint32_t val,int len) {PCIDevice *pci_dev =pci_dev_find_by_addr (s, addr);uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE -1 ); -if (!pci_dev) +if (!pci_dev) {return ; + }PCI_DPRINTF ("%s: %s: addr=%02" PRIx32" val=%08" PRIx32" len=%d\n" , __func__, pci_dev->name, config_addr, val, len); - pci_dev->config_write (pci_dev, config_addr, val, len); +pci_config_write_common (pci_dev, config_addr,PCI_CONFIG_SPACE_SIZE , val, + len); }uint32_t pci_data_read (PCIBus *s,uint32_t addr,int len)
@@ -66,12 +82,12 @@ uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len)uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE -1 );uint32_t val; -assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } - val = pci_dev->config_read (pci_dev, config_addr, len); + val =pci_config_read_common (pci_dev, config_addr,PCI_CONFIG_SPACE_SIZE , + len);PCI_DPRINTF ("%s: %s: addr=%02" PRIx32" val=%08" PRIx32" len=%d\n" , __func__, pci_dev->name, config_addr, val, len);
hw/pci_host.h +6 -0
@@ -39,6 +39,12 @@ struct PCIHostState {PCIBus *bus; }; +/* common internal helpers for PCI/PCIe hosts, cut off overflows */ +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t addr_mask,uint32_t val,uint32_t len); +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t addr_mask,uint32_t len); +void pci_data_write (PCIBus *s,uint32_t addr,uint32_t val,int len);uint32_t pci_data_read (PCIBus *s,uint32_t addr,int len);
hw/pcie_host.c +6 -6
@@ -57,22 +57,22 @@ static void pcie_mmcfg_data_write(PCIBus *s, {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, mmcfg_addr); -if (!pci_dev) +if (!pci_dev) {return ; - - pci_dev->config_write (pci_dev, -PCIE_MMCFG_CONFOFFSET (mmcfg_addr), val, len); + } +pci_config_write_common (pci_dev,PCIE_MMCFG_CONFOFFSET (mmcfg_addr), +pci_config_size (pci_dev), val, len); }static uint32_t pcie_mmcfg_data_read (PCIBus *s,uint32_t addr,int len) {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, addr); -assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } -return pci_dev->config_read (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), len); +return pci_config_read_common (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), +pci_config_size (pci_dev), len); } static void pcie_mmcfg_data_writeb(void *opaque,
Signature · 1 line
1.7.3.4
Quoted 98 lines · Jan Kiszka
Introduce pci_config_read/write_common helpers to prevent passing accesses down the callback chain that go beyond the config space limits. Adjust length assertions as they are no longer correct (cutting may generate valid 3 byte accesses).
Signed-off-by Jan Kiszka <[email protected]>--- hw/pci.c | 6 ++---- hw/pci_host.c | 24 ++++++++++++++++++++---- hw/pci_host.h | 6 ++++++ hw/pcie_host.c | 12 ++++++------ 4 files changed, 34 insertions(+), 14 deletions(-)hw/pci.c +2
-4@@ -1108,8 +1108,7 @@ uint32_t pci_default_read_config(PCIDevice *d, uint32_t address, int len) {uint32_t val =0 ; -assert (len ==1 || len ==2 || len ==4 ); - len =MIN (len,pci_config_size (d) - address); +memcpy (&val, d->config + address, len);return le32_to_cpu (val); }@@ -1117,9 +1116,8 @@ uint32_t pci_default_read_config(PCIDevice *d,void pci_default_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int l) {int i, was_irq_disabled =pci_irq_disabled (d); -uint32_t config_size =pci_config_size (d); -for (i =0 ; i < l && addr + i < config_size; val >>=8 , ++i) { +for (i =0 ; i < l; val >>=8 , ++i) {uint8_t wmask = d->wmask[addr + i];uint8_t w1cmask = d->w1cmask[addr + i];assert (!(wmask & w1cmask));hw/pci_host.c +20
-4@@ -47,17 +47,33 @@ static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr)return pci_find_device (bus, bus_num, devfn); } +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t val,uint32_t len) +{ +assert (len <=4 ); + pci_dev->config_write (pci_dev, addr, val,MIN (len, limit - addr)); +} + +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t len) +{ +assert (len <=4 ); +return pci_dev->config_read (pci_dev, addr,MIN (len, limit - addr)); +} +void pci_data_write (PCIBus *s,uint32_t addr,uint32_t val,int len) {PCIDevice *pci_dev =pci_dev_find_by_addr (s, addr);uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE -1 ); -if (!pci_dev) +if (!pci_dev) {return ; + }PCI_DPRINTF ("%s: %s: addr=%02" PRIx32" val=%08" PRIx32" len=%d\n" , __func__, pci_dev->name, config_addr, val, len); - pci_dev->config_write (pci_dev, config_addr, val, len); +pci_config_write_common (pci_dev, config_addr,PCI_CONFIG_SPACE_SIZE , val, + len); }uint32_t pci_data_read (PCIBus *s,uint32_t addr,int len)@@ -66,12 +82,12 @@ uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len)uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE -1 );uint32_t val; -assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } - val = pci_dev->config_read (pci_dev, config_addr, len); + val =pci_config_read_common (pci_dev, config_addr,PCI_CONFIG_SPACE_SIZE , + len);PCI_DPRINTF ("%s: %s: addr=%02" PRIx32" val=%08" PRIx32" len=%d\n" , __func__, pci_dev->name, config_addr, val, len);hw/pci_host.h +0
-0
hw/pci_host.h struct PCIHostState { · line 47
Quoted 9 lines
hw/pci_host.h +6
-0@@ -39,6 +39,12 @@ struct PCIHostState {PCIBus *bus; }; +/* common internal helpers for PCI/PCIe hosts, cut off overflows */ +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t addr_mask,uint32_t val,uint32_t len); +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t addr_mask,uint32_t len); +
OK, except it's config_size, not addr_mask anymore. I'd also prefer a name like pci_host_config_write_common/ pci_host_config_read_common but it's not a must.
Quoted 38 lines
hw/pci_host.h +0
-0void pci_data_write (PCIBus *s,uint32_t addr,uint32_t val,int len);uint32_t pci_data_read (PCIBus *s,uint32_t addr,int len);hw/pcie_host.c +6
-6@@ -57,22 +57,22 @@ static void pcie_mmcfg_data_write(PCIBus *s, {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, mmcfg_addr); -if (!pci_dev) +if (!pci_dev) {return ; - - pci_dev->config_write (pci_dev, -PCIE_MMCFG_CONFOFFSET (mmcfg_addr), val, len); + } +pci_config_write_common (pci_dev,PCIE_MMCFG_CONFOFFSET (mmcfg_addr), +pci_config_size (pci_dev), val, len); }static uint32_t pcie_mmcfg_data_read (PCIBus *s,uint32_t addr,int len) {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, addr); -assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } -return pci_dev->config_read (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), len); +return pci_config_read_common (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), +pci_config_size (pci_dev), len); } static void pcie_mmcfg_data_writeb(void *opaque,Signature · 1 line
1.7.3.4
Quoted 6 lines
Introduce pci_config_read/write_common helpers to prevent passing accesses down the callback chain that go beyond the config space limits. Adjust length assertions as they are no longer correct (cutting may generate valid 3 byte accesses).
Signed-off-by Jan Kiszka <[email protected]>
I renamed to pci_host_config_read/write_common and applied this. Thanks!
Quoted 139 lines
--- hw/pci.c | 6 ++---- hw/pci_host.c | 24 ++++++++++++++++++++---- hw/pci_host.h | 6 ++++++ hw/pcie_host.c | 12 ++++++------ 4 files changed, 34 insertions(+), 14 deletions(-)hw/pci.c +2
-4@@ -1108,8 +1108,7 @@ uint32_t pci_default_read_config(PCIDevice *d, uint32_t address, int len) {uint32_t val =0 ; -assert (len ==1 || len ==2 || len ==4 ); - len =MIN (len,pci_config_size (d) - address); +memcpy (&val, d->config + address, len);return le32_to_cpu (val); }@@ -1117,9 +1116,8 @@ uint32_t pci_default_read_config(PCIDevice *d,void pci_default_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int l) {int i, was_irq_disabled =pci_irq_disabled (d); -uint32_t config_size =pci_config_size (d); -for (i =0 ; i < l && addr + i < config_size; val >>=8 , ++i) { +for (i =0 ; i < l; val >>=8 , ++i) {uint8_t wmask = d->wmask[addr + i];uint8_t w1cmask = d->w1cmask[addr + i];assert (!(wmask & w1cmask));hw/pci_host.c +20
-4@@ -47,17 +47,33 @@ static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr)return pci_find_device (bus, bus_num, devfn); } +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t val,uint32_t len) +{ +assert (len <=4 ); + pci_dev->config_write (pci_dev, addr, val,MIN (len, limit - addr)); +} + +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t len) +{ +assert (len <=4 ); +return pci_dev->config_read (pci_dev, addr,MIN (len, limit - addr)); +} +void pci_data_write (PCIBus *s,uint32_t addr,uint32_t val,int len) {PCIDevice *pci_dev =pci_dev_find_by_addr (s, addr);uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE -1 ); -if (!pci_dev) +if (!pci_dev) {return ; + }PCI_DPRINTF ("%s: %s: addr=%02" PRIx32" val=%08" PRIx32" len=%d\n" , __func__, pci_dev->name, config_addr, val, len); - pci_dev->config_write (pci_dev, config_addr, val, len); +pci_config_write_common (pci_dev, config_addr,PCI_CONFIG_SPACE_SIZE , val, + len); }uint32_t pci_data_read (PCIBus *s,uint32_t addr,int len)@@ -66,12 +82,12 @@ uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len)uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE -1 );uint32_t val; -assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } - val = pci_dev->config_read (pci_dev, config_addr, len); + val =pci_config_read_common (pci_dev, config_addr,PCI_CONFIG_SPACE_SIZE , + len);PCI_DPRINTF ("%s: %s: addr=%02" PRIx32" val=%08" PRIx32" len=%d\n" , __func__, pci_dev->name, config_addr, val, len);hw/pci_host.h +6
-0@@ -39,6 +39,12 @@ struct PCIHostState {PCIBus *bus; }; +/* common internal helpers for PCI/PCIe hosts, cut off overflows */ +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t addr_mask,uint32_t val,uint32_t len); +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t addr_mask,uint32_t len); +void pci_data_write (PCIBus *s,uint32_t addr,uint32_t val,int len);uint32_t pci_data_read (PCIBus *s,uint32_t addr,int len);hw/pcie_host.c +6
-6@@ -57,22 +57,22 @@ static void pcie_mmcfg_data_write(PCIBus *s, {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, mmcfg_addr); -if (!pci_dev) +if (!pci_dev) {return ; - - pci_dev->config_write (pci_dev, -PCIE_MMCFG_CONFOFFSET (mmcfg_addr), val, len); + } +pci_config_write_common (pci_dev,PCIE_MMCFG_CONFOFFSET (mmcfg_addr), +pci_config_size (pci_dev), val, len); }static uint32_t pcie_mmcfg_data_read (PCIBus *s,uint32_t addr,int len) {PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, addr); -assert (len ==1 || len ==2 || len ==4 );if (!pci_dev) {return ~0x0 ; } -return pci_dev->config_read (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), len); +return pci_config_read_common (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), +pci_config_size (pci_dev), len); } static void pcie_mmcfg_data_writeb(void *opaque,Signature · 1 line
1.7.3.4
Quoted 9 lines · Michael S. Tsirkin
Quoted 6 lines
Introduce pci_config_read/write_common helpers to prevent passing accesses down the callback chain that go beyond the config space limits. Adjust length assertions as they are no longer correct (cutting may generate valid 3 byte accesses).
Signed-off-by Jan Kiszka <[email protected]>I renamed to pci_host_config_read/write_common and applied this. Thanks!
Perfect, thanks for cleaning up!
Jan
Signature · 2 lines
Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux
This might be a bit late comment...
Quoted 12 lines · Jan Kiszka
hw/pci_host.c +4
-0@@ -47,17 +47,33 @@ static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr)return pci_find_device (bus, bus_num, devfn); } +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t val,uint32_t len) +{ +assert (len <=4 );
hw/pci_host.c static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr) · line 63
Quoted 10 lines
hw/pci_host.c +10
-0+ pci_dev->config_write (pci_dev, addr, val,MIN (len, limit - addr)); +} + +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t len) +{ +assert (len <=4 ); +return pci_dev->config_read (pci_dev, addr,MIN (len, limit - addr)); +} +
Since limit and addr is unsigned, MIN(len, limit - addr) = len if limit < addr. So we need explicit "if (limit < addr) return;".
Here's the patch for pci branch.
Quoted 1 line
From
75c1a2b47c93ad987cd7a37fb62bda9a59f27948Mon Sep 17 00:00:00 2001
Message-Id: <75c1a2b47c93ad987cd7a37fb62bda9a59f27948.1311837763.git.yamahata@valinux.co.jp>
From: Isaku Yamahata <[email protected]>
Date: Thu, 28 Jul 2011 16:20:28 +0900
Subject: [PATCH] pci/host: limit check of pci_host_config_read/write_common
This patch adds boundary check in pci_host_config_read/write_common() Since limit and addr is unsigned, MIN(len, limit - addr) = len if limit < addr. So we need explicit "if (limit <= addr) return;"
--- hw/pci_host.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
hw/pci_host.c +6 -0
@@ -51,6 +51,9 @@ void pci_host_config_write_common(PCIDevice *pci_dev, uint32_t addr, uint32_t limit, uint32_t val, uint32_t len) { assert(len <= 4); +if (limit <= addr) { +return ; + } pci_dev->config_write (pci_dev, addr, val,MIN (len, limit - addr)); }
@@ -58,6 +61,9 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t addr, uint32_t limit, uint32_t len) {assert (len <=4 ); +if (limit <= addr) { +return 0 ; + }return pci_dev->config_read (pci_dev, addr,MIN (len, limit - addr)); }
Signature · 4 lines
1.7.1.1 -- yamahata
Quoted 36 lines · Isaku Yamahata
This might be a bit late comment...
Quoted 12 lines · Jan Kiszka
hw/pci_host.c +4
-0@@ -47,17 +47,33 @@ static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr)return pci_find_device (bus, bus_num, devfn); } +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t val,uint32_t len) +{ +assert (len <=4 );hw/pci_host.c static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr) · line 63
Quoted 10 lines
hw/pci_host.c +10
-0+ pci_dev->config_write (pci_dev, addr, val,MIN (len, limit - addr)); +} + +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t len) +{ +assert (len <=4 ); +return pci_dev->config_read (pci_dev, addr,MIN (len, limit - addr)); +} +Since limit and addr is unsigned,
MIN(len, limit - addr)= len if limit < addr. So we need explicit "if (limit < addr) return;".
Here's the patch for pci branch.Quoted 1 line
From
75c1a2b47c93ad987cd7a37fb62bda9a59f27948Mon Sep 17 00:00:00 2001Message-Id: <75c1a2b47c93ad987cd7a37fb62bda9a59f27948.1311837763.git.yamahata@valinux.co.jp>
From: Isaku Yamahata <[email protected]>
Date: Thu, 28 Jul 2011 16:20:28 +0900
Subject: [PATCH] pci/host: limit check of pci_host_config_read/write_common
Quoted 5 lines
This patch adds boundary check in pci_host_config_read/write_common() Since limit and addr is unsigned,
MIN(len, limit - addr)= len if limit < addr. So we need explicit "if (limit <= addr) return;"Signed-off-by Isaku Yamahata <[email protected]>
I don't see a problem with this, but could you please clarify when does this happen? I think this is only possible for a pci device behind an express root. If so, this belongs in pcie_host.c
I'd also like this info to be recorded in the commit log.
Quoted 33 lines
--- hw/pci_host.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)hw/pci_host.c +6
-0@@ -51,6 +51,9 @@ void pci_host_config_write_common(PCIDevice *pci_dev, uint32_t addr, uint32_t limit, uint32_t val, uint32_t len) { assert(len <= 4); +if (limit <= addr) { +return ; + } pci_dev->config_write (pci_dev, addr, val,MIN (len, limit - addr)); }@@ -58,6 +61,9 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t addr, uint32_t limit, uint32_t len) {assert (len <=4 ); +if (limit <= addr) { +return 0 ; + }return pci_dev->config_read (pci_dev, addr,MIN (len, limit - addr)); }Signature · 4 lines
1.7.1.1 -- yamahata
Quoted 41 lines · Michael S. Tsirkin
Quoted 40 lines · Isaku Yamahata
This might be a bit late comment...
Quoted 12 lines · Jan Kiszka
hw/pci_host.c +4
-0@@ -47,17 +47,33 @@ static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr)return pci_find_device (bus, bus_num, devfn); } +void pci_config_write_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t val,uint32_t len) +{ +assert (len <=4 );hw/pci_host.c static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr) · line 63
Quoted 10 lines
hw/pci_host.c +10
-0+ pci_dev->config_write (pci_dev, addr, val,MIN (len, limit - addr)); +} + +uint32_t pci_config_read_common (PCIDevice *pci_dev,uint32_t addr, +uint32_t limit,uint32_t len) +{ +assert (len <=4 ); +return pci_dev->config_read (pci_dev, addr,MIN (len, limit - addr)); +} +Since limit and addr is unsigned,
MIN(len, limit - addr)= len if limit < addr. So we need explicit "if (limit < addr) return;".
Here's the patch for pci branch.Quoted 1 line
From
75c1a2b47c93ad987cd7a37fb62bda9a59f27948Mon Sep 17 00:00:00 2001Message-Id: <75c1a2b47c93ad987cd7a37fb62bda9a59f27948.1311837763.git.yamahata@valinux.co.jp>
From: Isaku Yamahata <[email protected]>
Date: Thu, 28 Jul 2011 16:20:28 +0900
Subject: [PATCH] pci/host: limit check of pci_host_config_read/write_commonThis patch adds boundary check in pci_host_config_read/write_common() Since limit and addr is unsigned,
MIN(len, limit - addr)= len if limit < addr. So we need explicit "if (limit <= addr) return;"
Quoted 5 lines
Quoted 1 line
Signed-off-by Isaku Yamahata <[email protected]>I don't see a problem with this, but could you please clarify when does this happen? I think this is only possible for a pci device behind an express root. If so, this belongs in
pcie_host.c
Right. I'll move the check into pcie_host.c
Signature · 1 line
yamahata
Quoted 7 lines · Michael S. Tsirkin
I don't see a problem with this, but could you please clarify when does this happen? I think this is only possible for a pci device behind an express root. If so, this belongs in
pcie_host.cI'd also like this info to be recorded in the commit log.
From
1dd598fd35d4e988dc51487829ed66208ca89021Mon Sep 17 00:00:00 2001
Message-Id: <1dd598fd35d4e988dc51487829ed66208ca89021.1311901239.git.yamahata@valinux.co.jp>
From: Isaku Yamahata <[email protected]>
Date: Fri, 29 Jul 2011 09:52:45 +0900
Subject: [PATCH] pcie_host: limit check of pcie_mmcfg_data_write/read
This patch adds the check where the offset in the configuration space is in its configuration size.
MMCFG area allows access of pcie configuration space to be in offset [0, 4K).
At the same time, conventional pci devices whose configuration space size is 256 bytes can be behind pcie-to-pci bridge.
The access whose offset is [256, 4K) should have no effect
on the conventional pci device
Add the limit check and ignore such accesses.
--- hw/pcie_host.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-)
hw/pcie_host.c +22 -6
@@ -56,23 +56,39 @@ static void pcie_mmcfg_data_write(PCIBus *s, uint32_t mmcfg_addr, uint32_t val, int len) { PCIDevice *pci_dev = pcie_dev_find_by_mmcfg_addr(s, mmcfg_addr); +uint32_t addr; +uint32_t limit;if (!pci_dev) {return ; } -pci_host_config_write_common (pci_dev,PCIE_MMCFG_CONFOFFSET (mmcfg_addr), -pci_config_size (pci_dev), val, len); + addr =PCIE_MMCFG_CONFOFFSET (mmcfg_addr); + limit =pci_config_size (pci_dev); +if (limit <= addr) { +/* conventional pci device can be behind pcie-to-pci bridge. +256 <= addr < 4K has no effects. */ +return ; + } +pci_host_config_write_common (pci_dev, addr, limit, val, len); } -static uint32_t pcie_mmcfg_data_read (PCIBus *s,uint32_t addr,int len) +static uint32_t pcie_mmcfg_data_read (PCIBus *s,uint32_t mmcfg_addr,int len) { -PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, addr); +PCIDevice *pci_dev =pcie_dev_find_by_mmcfg_addr (s, mmcfg_addr); +uint32_t addr; +uint32_t limit;if (!pci_dev) {return ~0x0 ; } -return pci_host_config_read_common (pci_dev,PCIE_MMCFG_CONFOFFSET (addr), -pci_config_size (pci_dev), len); + addr =PCIE_MMCFG_CONFOFFSET (mmcfg_addr); + limit =pci_config_size (pci_dev); +if (limit <= addr) { +/* conventional pci device can be behind pcie-to-pci bridge. +256 <= addr < 4K has no effects. */ +return ~0x0 ; + } +return pci_host_config_read_common (pci_dev, addr, limit, len); } static void pcie_mmcfg_data_writeb(void *opaque,
Signature · 6 lines
1.7.1.1 -- yamahata
Quoted 24 lines · Isaku Yamahata
Quoted 7 lines · Michael S. Tsirkin
I don't see a problem with this, but could you please clarify when does this happen? I think this is only possible for a pci device behind an express root. If so, this belongs in
pcie_host.cI'd also like this info to be recorded in the commit log.
From
1dd598fd35d4e988dc51487829ed66208ca89021Mon Sep 17 00:00:00 2001Message-Id: <1dd598fd35d4e988dc51487829ed66208ca89021.1311901239.git.yamahata@valinux.co.jp>
From: Isaku Yamahata <[email protected]>
Date: Fri, 29 Jul 2011 09:52:45 +0900
Subject: [PATCH]pcie_host: limit check of pcie_mmcfg_data_write/readThis patch adds the check where the offset in the configuration space is in its configuration size.
MMCFG area allows access of pcie configuration space to be in offset [0, 4K).
At the same time, conventional pci devices whose configuration space size is 256 bytes can be behind pcie-to-pci bridge.
The access whose offset is [256, 4K) should have no effect
on the conventional pci device
Add the limit check and ignore such accesses.
Quoted 1 line
Signed-off-by Isaku Yamahata <[email protected]>
I tweaked the commit log and applied this.
Thanks!