The memory layout of struct vfio_device_gfx_plane_info is architecture-dependent due to a u64 field and a struct size that is not a multiple of 8 bytes: - On x86_64 the struct size is padded to a multiple of 8 bytes. - On x32 the struct size is only a multiple of 4 bytes, not 8. - Other architectures may vary. Use __aligned_u64 to make memory layout consistent. This reduces the chance of 32-bit userspace on a 64-bit kernel breakage. This patch increases the struct size on x32 but this is safe because of the struct's argsz field. The kernel may grow the struct as long as it still supports smaller argsz values from userspace (e.g. applications compiled against older kernel headers).
Unified · Split
| @@ -1379,7 +1379,7 @@ static long intel_vgpu_ioctl(struct vfio_device *vfio_dev, unsigned int cmd, · 1378 unmodified lines | |||
| 1379 | intel_gvt_reset_vgpu(vgpu); | 1379 | intel_gvt_reset_vgpu(vgpu); |
| 1380 | return 0; | 1380 | return 0; |
| 1381 | } else if (cmd == VFIO_DEVICE_QUERY_GFX_PLANE) { | 1381 | } else if (cmd == VFIO_DEVICE_QUERY_GFX_PLANE) { |
| 1382 | struct vfio_device_gfx_plane_info dmabuf; | 1382 | struct vfio_device_gfx_plane_info dmabuf = {}; |
| 1383 | int ret = 0; | 1383 | int ret = 0; |
| 1384 | 1384 | ||
| 1385 | minsz = offsetofend(struct vfio_device_gfx_plane_info, | 1385 | minsz = offsetofend(struct vfio_device_gfx_plane_info, |
| @@ -816,7 +816,7 @@ struct vfio_device_gfx_plane_info { · 815 unmodified lines | |||
| 816 | __u32 drm_plane_type; /* type of plane: DRM_PLANE_TYPE_* */ | 816 | __u32 drm_plane_type; /* type of plane: DRM_PLANE_TYPE_* */ |
| 817 | /* out */ | 817 | /* out */ |
| 818 | __u32 drm_format; /* drm format of plane */ | 818 | __u32 drm_format; /* drm format of plane */ |
| 819 | __u64 drm_format_mod; /* tiled mode */ | 819 | __aligned_u64 drm_format_mod; /* tiled mode */ |
| 820 | __u32 width; /* width of plane */ | 820 | __u32 width; /* width of plane */ |
| 821 | __u32 height; /* height of plane */ | 821 | __u32 height; /* height of plane */ |
| 822 | __u32 stride; /* stride of plane */ | 822 | __u32 stride; /* stride of plane */ |
| @@ -829,6 +829,7 @@ struct vfio_device_gfx_plane_info { · 6 unmodified lines | |||
| 829 | __u32 region_index; /* region index */ | 829 | __u32 region_index; /* region index */ |
| 830 | __u32 dmabuf_id; /* dma-buf id */ | 830 | __u32 dmabuf_id; /* dma-buf id */ |
| 831 | }; | 831 | }; |
| 832 | __u32 reserved; | ||
| 832 | }; | 833 | }; |
| 833 | 834 | ||
| 834 | #define VFIO_DEVICE_QUERY_GFX_PLANE _IO(VFIO_TYPE, VFIO_BASE + 14) | 835 | #define VFIO_DEVICE_QUERY_GFX_PLANE _IO(VFIO_TYPE, VFIO_BASE + 14) |
| @@ -1262,7 +1262,7 @@ static long mbochs_ioctl(struct vfio_device *vdev, unsigned int cmd, · 1261 unmodified lines | |||
| 1262 | 1262 | ||
| 1263 | case VFIO_DEVICE_QUERY_GFX_PLANE: | 1263 | case VFIO_DEVICE_QUERY_GFX_PLANE: |
| 1264 | { | 1264 | { |
| 1265 | struct vfio_device_gfx_plane_info plane; | 1265 | struct vfio_device_gfx_plane_info plane = {}; |
| 1266 | 1266 | ||
| 1267 | minsz = offsetofend(struct vfio_device_gfx_plane_info, | 1267 | minsz = offsetofend(struct vfio_device_gfx_plane_info, |
| 1268 | region_index); | 1268 | region_index); |
| @@ -591,7 +591,7 @@ static long mdpy_ioctl(struct vfio_device *vdev, unsigned int cmd, · 590 unmodified lines | |||
| 591 | 591 | ||
| 592 | case VFIO_DEVICE_QUERY_GFX_PLANE: | 592 | case VFIO_DEVICE_QUERY_GFX_PLANE: |
| 593 | { | 593 | { |
| 594 | struct vfio_device_gfx_plane_info plane; | 594 | struct vfio_device_gfx_plane_info plane = {}; |
| 595 | 595 | ||
| 596 | minsz = offsetofend(struct vfio_device_gfx_plane_info, | 596 | minsz = offsetofend(struct vfio_device_gfx_plane_info, |
| 597 | region_index); | 597 | region_index); |