vfio/type1: fix cap_migration information leak
Subsystems (2)
PATCH 1/1 vfio/type1: fix cap_migration information leak
Fix an information leak where an uninitialized hole in struct vfio_iommu_type1_info_cap_migration on the stack is exposed to userspace.
The definition of struct vfio_iommu_type1_info_cap_migration contains a hole as shown in this pahole(1) output:
struct vfio_iommu_type1_info_cap_migration {
struct vfio_info_cap_header header; /* 0 8 */
__u32 flags; /* 8 4 */ /* XXX 4 bytes hole, try to pack */
__u64 pgsize_bitmap; /* 16 8 */
__u64 max_dirty_bitmap_size; /* 24 8 */
/* size: 32, cachelines: 1, members: 4 */
/* sum members: 28, holes: 1, sum holes: 4 */
/* last cacheline: 32 bytes */};
The cap_mig variable is filled in without initializing the hole:
static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,
struct vfio_info_cap *caps)
{
struct vfio_iommu_type1_info_cap_migration cap_mig;
cap_mig.header.id = VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION;
cap_mig.header.version = 1;
cap_mig.flags = 0;
/* support minimum pgsize */
cap_mig.pgsize_bitmap = (size_t)1 << __ffs(iommu->pgsize_bitmap);
cap_mig.max_dirty_bitmap_size = DIRTY_BITMAP_SIZE_MAX;
return vfio_info_add_capability(caps, &cap_mig.header, sizeof(cap_mig));}
The structure is then copied to a temporary location on the heap. At this point it's already too late and ioctl(VFIO_IOMMU_GET_INFO) copies it to userspace later:
int vfio_info_add_capability(struct vfio_info_cap *caps,
struct vfio_info_cap_header *cap, size_t size)
{
struct vfio_info_cap_header *header;
header = vfio_info_cap_add(caps, size, cap->id, cap->version);
if (IS_ERR(header))
return PTR_ERR(header);
memcpy(header + 1, cap + 1, size - sizeof(*header));
return 0;}
This issue was found by code inspection.
--- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/vfio_iommu_type1.c +1 -1
@@ -2732,7 +2732,7 @@ static int vfio_iommu_iova_build_caps(struct vfio_iommu *iommu,static int vfio_iommu_migration_build_caps (struct vfio_iommu *iommu,struct vfio_info_cap *caps) { -struct vfio_iommu_type1_info_cap_migration cap_mig; +struct vfio_iommu_type1_info_cap_migration cap_mig = {}; cap_mig.header.id =VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION ; cap_mig.header.version =1 ;
Signature · 1 line
2.41.0
Quoted 54 lines · On Tue, 1 Aug 2023 11:53:52 -0400 Stefan Hajnoczi <[email protected]> wrote:
Fix an information leak where an uninitialized hole in struct
vfio_iommu_type1_info_cap_migrationon the stack is exposed to userspace.The definition of struct
vfio_iommu_type1_info_cap_migrationcontains a hole as shown in this pahole(1) output:struct vfio_iommu_type1_info_cap_migration { struct vfio_info_cap_header header; /* 0 8 */ __u32 flags; /* 8 4 *//* XXX 4 bytes hole, try to pack */ __u64 pgsize_bitmap; /* 16 8 */ __u64 max_dirty_bitmap_size; /* 24 8 */ /* size: 32, cachelines: 1, members: 4 */ /* sum members: 28, holes: 1, sum holes: 4 */ /* last cacheline: 32 bytes */};
The
cap_migvariable is filled in without initializing the hole:static int vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,
structvfio_info_cap*caps){ struct vfio_iommu_type1_info_cap_migration cap_mig; cap_mig.header.id = VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION; cap_mig.header.version = 1; cap_mig.flags = 0; /* support minimum pgsize */ cap_mig.pgsize_bitmap = (size_t)1 << __ffs(iommu->pgsize_bitmap); cap_mig.max_dirty_bitmap_size = DIRTY_BITMAP_SIZE_MAX; return vfio_info_add_capability(caps, &cap_mig.header, sizeof(cap_mig));}
The structure is then copied to a temporary location on the heap. At this point it's already too late and
ioctl(VFIO_IOMMU_GET_INFO)copies it to userspace later:int vfio_info_add_capability(struct
vfio_info_cap*caps,
structvfio_info_cap_header*cap,size_tsize){ struct vfio_info_cap_header *header; header = vfio_info_cap_add(caps, size, cap->id, cap->version); if (IS_ERR(header)) return PTR_ERR(header); memcpy(header + 1, cap + 1, size - sizeof(*header)); return 0;
Quoted 3 lines
}
This issue was found by code inspection.
LGTM, but missing:
I'll give a bit for further comments/reviews and queue it for v6.6 with the above update. Thanks,
Alex
Quoted 19 lines
Signed-off-by Stefan Hajnoczi <[email protected]>--- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/vfio/vfio_iommu_type1.c +1
-1@@ -2732,7 +2732,7 @@ static int vfio_iommu_iova_build_caps(struct vfio_iommu *iommu,static int vfio_iommu_migration_build_caps (struct vfio_iommu *iommu,struct vfio_info_cap *caps) { -struct vfio_iommu_type1_info_cap_migration cap_mig; +struct vfio_iommu_type1_info_cap_migration cap_mig = {}; cap_mig.header.id =VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION ; cap_mig.header.version =1 ;
Quoted 59 lines · Alex Williamson
Quoted 56 lines · On Tue, 1 Aug 2023 11:53:52 -0400 Stefan Hajnoczi <[email protected]> wrote:
Fix an information leak where an uninitialized hole in struct
vfio_iommu_type1_info_cap_migrationon the stack is exposed to userspace.The definition of struct
vfio_iommu_type1_info_cap_migrationcontains a hole as shown in this pahole(1) output:struct vfio_iommu_type1_info_cap_migration { struct vfio_info_cap_header header; /* 0 8 */ __u32 flags; /* 8 4 *//* XXX 4 bytes hole, try to pack */ __u64 pgsize_bitmap; /* 16 8 */ __u64 max_dirty_bitmap_size; /* 24 8 */ /* size: 32, cachelines: 1, members: 4 */ /* sum members: 28, holes: 1, sum holes: 4 */ /* last cacheline: 32 bytes */};
The
cap_migvariable is filled in without initializing the hole:static int vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,
structvfio_info_cap*caps){ struct vfio_iommu_type1_info_cap_migration cap_mig; cap_mig.header.id = VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION; cap_mig.header.version = 1; cap_mig.flags = 0; /* support minimum pgsize */ cap_mig.pgsize_bitmap = (size_t)1 << __ffs(iommu->pgsize_bitmap); cap_mig.max_dirty_bitmap_size = DIRTY_BITMAP_SIZE_MAX; return vfio_info_add_capability(caps, &cap_mig.header, sizeof(cap_mig));}
The structure is then copied to a temporary location on the heap. At this point it's already too late and
ioctl(VFIO_IOMMU_GET_INFO)copies it to userspace later:int vfio_info_add_capability(struct
vfio_info_cap*caps,
structvfio_info_cap_header*cap,size_tsize){ struct vfio_info_cap_header *header; header = vfio_info_cap_add(caps, size, cap->id, cap->version); if (IS_ERR(header)) return PTR_ERR(header); memcpy(header + 1, cap + 1, size - sizeof(*header)); return 0;}
Quoted 8 lines
Quoted 1 line
This issue was found by code inspection.
LGTM, but missing:
Fixes ad721705d09c ("vfio iommu: Add migration capability to report supported features")I'll give a bit for further comments/reviews and queue it for v6.6 with the above update. Thanks,
Great, thanks for squashing in the "Fixes" line that I forgot.
Stefan
Quoted 59 lines
From: Stefan Hajnoczi <[email protected]>
Sent: Tuesday, August 1, 2023 11:54 PMFix an information leak where an uninitialized hole in struct
vfio_iommu_type1_info_cap_migrationon the stack is exposed to userspace.The definition of struct
vfio_iommu_type1_info_cap_migrationcontains a hole as
shown in this pahole(1) output:struct vfio_iommu_type1_info_cap_migration { struct vfio_info_cap_header header; /* 0 8 */ __u32 flags; /* 8 4 *//* XXX 4 bytes hole, try to pack */ __u64 pgsize_bitmap; /* 16 8 */ __u64 max_dirty_bitmap_size; /* 24 8 */ /* size: 32, cachelines: 1, members: 4 */ /* sum members: 28, holes: 1, sum holes: 4 */ /* last cacheline: 32 bytes */};
The
cap_migvariable is filled in without initializing the hole:static int vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,
structvfio_info_cap*caps){ struct vfio_iommu_type1_info_cap_migration cap_mig; cap_mig.header.id = VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION; cap_mig.header.version = 1; cap_mig.flags = 0; /* support minimum pgsize */ cap_mig.pgsize_bitmap = (size_t)1 << __ffs(iommu->pgsize_bitmap); cap_mig.max_dirty_bitmap_size = DIRTY_BITMAP_SIZE_MAX; return vfio_info_add_capability(caps, &cap_mig.header, sizeof(cap_mig));}
The structure is then copied to a temporary location on the heap. At this point
it's already too late andioctl(VFIO_IOMMU_GET_INFO)copies it to userspace later:int vfio_info_add_capability(struct
vfio_info_cap*caps,
structvfio_info_cap_header*cap,size_tsize){ struct vfio_info_cap_header *header; header = vfio_info_cap_add(caps, size, cap->id, cap->version); if (IS_ERR(header)) return PTR_ERR(header); memcpy(header + 1, cap + 1, size - sizeof(*header)); return 0;
Quoted 5 lines
}
This issue was found by code inspection.
Signed-off-by Stefan Hajnoczi <[email protected]>
nit. better also add a 'reserved' field in cap_migration to mark the hole.
Alex Williamson
AppliedQuoted 54 lines · On Tue, 1 Aug 2023 11:53:52 -0400 Stefan Hajnoczi <[email protected]> wrote:
Fix an information leak where an uninitialized hole in struct
vfio_iommu_type1_info_cap_migrationon the stack is exposed to userspace.The definition of struct
vfio_iommu_type1_info_cap_migrationcontains a hole as shown in this pahole(1) output:struct vfio_iommu_type1_info_cap_migration { struct vfio_info_cap_header header; /* 0 8 */ __u32 flags; /* 8 4 *//* XXX 4 bytes hole, try to pack */ __u64 pgsize_bitmap; /* 16 8 */ __u64 max_dirty_bitmap_size; /* 24 8 */ /* size: 32, cachelines: 1, members: 4 */ /* sum members: 28, holes: 1, sum holes: 4 */ /* last cacheline: 32 bytes */};
The
cap_migvariable is filled in without initializing the hole:static int vfio_iommu_migration_build_caps(struct
vfio_iommu*iommu,
structvfio_info_cap*caps){ struct vfio_iommu_type1_info_cap_migration cap_mig; cap_mig.header.id = VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION; cap_mig.header.version = 1; cap_mig.flags = 0; /* support minimum pgsize */ cap_mig.pgsize_bitmap = (size_t)1 << __ffs(iommu->pgsize_bitmap); cap_mig.max_dirty_bitmap_size = DIRTY_BITMAP_SIZE_MAX; return vfio_info_add_capability(caps, &cap_mig.header, sizeof(cap_mig));}
The structure is then copied to a temporary location on the heap. At this point it's already too late and
ioctl(VFIO_IOMMU_GET_INFO)copies it to userspace later:int vfio_info_add_capability(struct
vfio_info_cap*caps,
structvfio_info_cap_header*cap,size_tsize){ struct vfio_info_cap_header *header; header = vfio_info_cap_add(caps, size, cap->id, cap->version); if (IS_ERR(header)) return PTR_ERR(header); memcpy(header + 1, cap + 1, size - sizeof(*header)); return 0;
Quoted 8 lines
}
This issue was found by code inspection.
Signed-off-by Stefan Hajnoczi <[email protected]>--- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to vfio next branch for v6.6. I'll give Jason a little more time to ack "[PATCH v3] vfio: align capability structures". Thanks!
Alex
Quoted 14 lines
drivers/vfio/vfio_iommu_type1.c +1
-1@@ -2732,7 +2732,7 @@ static int vfio_iommu_iova_build_caps(struct vfio_iommu *iommu,static int vfio_iommu_migration_build_caps (struct vfio_iommu *iommu,struct vfio_info_cap *caps) { -struct vfio_iommu_type1_info_cap_migration cap_mig; +struct vfio_iommu_type1_info_cap_migration cap_mig = {}; cap_mig.header.id =VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION ; cap_mig.header.version =1 ;