diff options
| author | Eric Auger <eric.auger@redhat.com> | 2016-11-21 07:21:02 +0100 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2016-11-21 19:51:53 +0100 |
| commit | 5ba6de98c78ac45166036516e34bec487887ba5d (patch) | |
| tree | c7102457c64e098736aab3ca8a11c21b53a34116 /drivers/vfio | |
| parent | vfio/pci: Drop unnecessary pcibios_err_to_errno() (diff) | |
| download | linux-5ba6de98c78ac45166036516e34bec487887ba5d.tar.xz linux-5ba6de98c78ac45166036516e34bec487887ba5d.zip | |
vfio: fix vfio_info_cap_add/shift
Capability header next field is an offset relative to the start of
the INFO buffer. tmp->next is assigned the proper value but iterations
implemented in vfio_info_cap_add and vfio_info_cap_shift use next
as an offset between the headers. When coping with multiple capabilities
this leads to an Oops.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
| -rw-r--r-- | drivers/vfio/vfio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index c8150674787c..0aac3ca54a53 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -1780,7 +1780,7 @@ struct vfio_info_cap_header *vfio_info_cap_add(struct vfio_info_cap *caps, header->version = version; /* Add to the end of the capability chain */ - for (tmp = caps->buf; tmp->next; tmp = (void *)tmp + tmp->next) + for (tmp = buf; tmp->next; tmp = buf + tmp->next) ; /* nothing */ tmp->next = caps->size; @@ -1793,8 +1793,9 @@ EXPORT_SYMBOL_GPL(vfio_info_cap_add); void vfio_info_cap_shift(struct vfio_info_cap *caps, size_t offset) { struct vfio_info_cap_header *tmp; + void *buf = (void *)caps->buf; - for (tmp = caps->buf; tmp->next; tmp = (void *)tmp + tmp->next - offset) + for (tmp = buf; tmp->next; tmp = buf + tmp->next - offset) tmp->next += offset; } EXPORT_SYMBOL(vfio_info_cap_shift); |