Changeset 5f03107 in mainline

Timestamp:

2018-05-22T19:06:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

659bd24

Parents:

21ff054

git-author:

Jakub Jermar <jakub@…> (2018-04-25 19:39:19)

git-committer:

Jakub Jermar <jakub@…> (2018-05-22 19:06:50)

Message:

Make sure the cfg structure is inside the resource

File:

• uspace/lib/virtio/virtio-pci.c (modified) (6 diffs)

uspace/lib/virtio/virtio-pci.c

@@ -36 +36 @@
 #include <pci_dev_iface.h>
 
-static bool check_bar(virtio_dev_t *vdev, uint8_t bar)
+static bool check_bar(virtio_dev_t *vdev, uint8_t bar, uint32_t offset,
+    uint32_t length)
 {
         /* We must ignore the capability if bar is greater than 5 */
@@ -46 +47 @@
                 return false;
 
+        uintptr_t start = (uintptr_t) vdev->bar[bar].mapped_base;
+        if (start + offset < start)
+                return false;
+        if (start + offset > start + vdev->bar[bar].mapped_size)
+                return false;
+        if (start + offset + length < start + offset)
+                return false;
+        if (start + offset + length > start + vdev->bar[bar].mapped_size)
+                return false;
+
         return true;
 }
@@ -55 +66 @@
                 return;
 
-        if (!check_bar(vdev, bar))
+        if (!check_bar(vdev, bar, offset, length))
                 return;
 
@@ -69 +80 @@
                 return;
 
-        if (!check_bar(vdev, bar))
+        if (!check_bar(vdev, bar, offset, length))
                 return;
 
@@ -85 +96 @@
                 return;
 
-        if (!check_bar(vdev, bar))
+        if (!check_bar(vdev, bar, offset, length))
                 return;
 
@@ -99 +110 @@
                 return;
 
-        if (!check_bar(vdev, bar))
+        if (!check_bar(vdev, bar, offset, length))
                 return;