Skip to contentSkip to conversation

virtio: pci: Sanity check the bar index in find_shm_cap

PATCH In review Keir Fraser 3 participants 4 messages Mar 21, 2022 – Mar 22, 2022 virtio core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 virtio: pci: Sanity check the bar index in find_shm_cap

The bar index is used as an index into the device's resource list and should be checked as within range for a standard bar.

---
 drivers/virtio/virtio_pci_modern.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/virtio/virtio_pci_modern.c +8 -2
index 5455bc041fb6..84bace98dff5 100644
@@ -293,7 +293,7 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
 
 	for (pos = pci_find_capability(dev, PCI_CAP_ID_VNDR); pos > 0;
 	     pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_VNDR)) {
-		u8 type, cap_len, id;
+		u8 type, cap_len, id, res_bar;
 		u32 tmp32;
 		u64 res_offset, res_length;
 
@@ -317,7 +317,12 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
 
 		/* Type, and ID match, looks good */
 		pci_read_config_byte(dev, pos + offsetof(struct virtio_pci_cap,
-							 bar), bar);
+							 bar), &res_bar);
+		if (res_bar >= PCI_STD_NUM_BARS) {
+			dev_err(&dev->dev, "%s: shm cap with bad bar: %d\n",
+				__func__, res_bar);
+			continue;
+		}
 
 		/* Read the lower 32bit of length and offset */
 		pci_read_config_dword(dev, pos + offsetof(struct virtio_pci_cap,
@@ -337,6 +342,7 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
 						     length_hi), &tmp32);
 		res_length |= ((u64)tmp32) << 32;
 
+		*bar = res_bar;
 		*offset = res_offset;
 		*len = res_length;
 
Signature · 1 line
2.35.1.894.gb6a874cedc-goog
#1 lore raw
Quoted 5 lines · Keir Fraser

The bar index is used as an index into the device's resource list and should be checked as within range for a standard bar.

Patch looks good, do we need a similar check in vp_modern_map_capability()?

Thanks

Quoted 40 lines
---
 drivers/virtio/virtio_pci_modern.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/virtio/virtio_pci_modern.c +8 -3
index 5455bc041fb6..84bace98dff5 100644
@@ -293,7 +293,7 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
 
        for (pos = pci_find_capability(dev, PCI_CAP_ID_VNDR); pos > 0;
             pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_VNDR)) {
-               u8 type, cap_len, id;
+               u8 type, cap_len, id, res_bar;
                u32 tmp32;
                u64 res_offset, res_length;
 
@@ -317,7 +317,12 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
 
                /* Type, and ID match, looks good */
                pci_read_config_byte(dev, pos + offsetof(struct virtio_pci_cap,
-                                                        bar), bar);
+                                                        bar), &res_bar);
+               if (res_bar >= PCI_STD_NUM_BARS) {
+                       dev_err(&dev->dev, "%s: shm cap with bad bar: %d\n",
+                               __func__, res_bar);
+                       continue;
+               }
 
                /* Read the lower 32bit of length and offset */
                pci_read_config_dword(dev, pos + offsetof(struct virtio_pci_cap,
@@ -337,6 +342,7 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
                                                     length_hi), &tmp32);
                res_length |= ((u64)tmp32) << 32;
 
+               *bar = res_bar;
                *offset = res_offset;
                *len = res_length;
 
--
Quoted 2 lines

2.35.1.894.gb6a874cedc-goog

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

#2 lore raw
Quoted 8 lines · Jason Wang
Quoted 5 lines · Keir Fraser

The bar index is used as an index into the device's resource list and should be checked as within range for a standard bar.

Patch looks good, do we need a similar check in vp_modern_map_capability()?

Yes it looks like we do. Would you like me to fix that also? If so: separate patch, or revised version of this patch?

Quoted 45 lines

Thanks

Quoted 42 lines
---
 drivers/virtio/virtio_pci_modern.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/virtio/virtio_pci_modern.c +8 -3
index 5455bc041fb6..84bace98dff5 100644
@@ -293,7 +293,7 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
 
        for (pos = pci_find_capability(dev, PCI_CAP_ID_VNDR); pos > 0;
             pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_VNDR)) {
-               u8 type, cap_len, id;
+               u8 type, cap_len, id, res_bar;
                u32 tmp32;
                u64 res_offset, res_length;
 
@@ -317,7 +317,12 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
 
                /* Type, and ID match, looks good */
                pci_read_config_byte(dev, pos + offsetof(struct virtio_pci_cap,
-                                                        bar), bar);
+                                                        bar), &res_bar);
+               if (res_bar >= PCI_STD_NUM_BARS) {
+                       dev_err(&dev->dev, "%s: shm cap with bad bar: %d\n",
+                               __func__, res_bar);
+                       continue;
+               }
 
                /* Read the lower 32bit of length and offset */
                pci_read_config_dword(dev, pos + offsetof(struct virtio_pci_cap,
@@ -337,6 +342,7 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
                                                     length_hi), &tmp32);
                res_length |= ((u64)tmp32) << 32;
 
+               *bar = res_bar;
                *offset = res_offset;
                *len = res_length;
 
--

2.35.1.894.gb6a874cedc-goog

#3 lore raw
Quoted 6 lines · Keir Fraser
Quoted 5 lines · Jason Wang
Quoted 4 lines · Keir Fraser

The bar index is used as an index into the device's resource list and should be checked as within range for a standard bar.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Patch looks good, do we need a similar check in vp_modern_map_capability()?

Yes it looks like we do. Would you like me to fix that also? If so: separate patch, or revised version of this patch?

Yes pls. A fixed version is better, less work for everyone.

Quoted 37 lines
Quoted 37 lines

Thanks

Quoted 35 lines
---
 drivers/virtio/virtio_pci_modern.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/virtio/virtio_pci_modern.c +7 -2
index 5455bc041fb6..84bace98dff5 100644
@@ -293,7 +293,7 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
 
        for (pos = pci_find_capability(dev, PCI_CAP_ID_VNDR); pos > 0;
             pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_VNDR)) {
-               u8 type, cap_len, id;
+               u8 type, cap_len, id, res_bar;
                u32 tmp32;
                u64 res_offset, res_length;
 
@@ -317,7 +317,12 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
 
                /* Type, and ID match, looks good */
                pci_read_config_byte(dev, pos + offsetof(struct virtio_pci_cap,
-                                                        bar), bar);
+                                                        bar), &res_bar);
+               if (res_bar >= PCI_STD_NUM_BARS) {
+                       dev_err(&dev->dev, "%s: shm cap with bad bar: %d\n",
+                               __func__, res_bar);
+                       continue;
+               }
 
                /* Read the lower 32bit of length and offset */
                pci_read_config_dword(dev, pos + offsetof(struct virtio_pci_cap,
@@ -337,6 +342,7 @@ static int virtio_pci_find_shm_cap(struct pci_dev *dev, u8 required_id,
                                                     length_hi), &tmp32);
                res_length |= ((u64)tmp32) << 32;
 
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
drivers/virtio/virtio_pci_modern.c +1 -1
+               *bar = res_bar;
                *offset = res_offset;
                *len = res_length;
 
--

2.35.1.894.gb6a874cedc-goog

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization