diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-10-16 09:49:02 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-11-28 14:02:05 +0000 |
| commit | 2afe1a102cd3962ed4ec683128765fd33a4ab666 (patch) | |
| tree | 0822897b0af430a4eed9c8e19aacf1b24e18df11 /include/drm | |
| parent | b60ff9bf0fa3a0a1e5b81055383ddbef42002f18 (diff) | |
| download | kernel_samsung_smdk4412-2afe1a102cd3962ed4ec683128765fd33a4ab666.zip kernel_samsung_smdk4412-2afe1a102cd3962ed4ec683128765fd33a4ab666.tar.gz kernel_samsung_smdk4412-2afe1a102cd3962ed4ec683128765fd33a4ab666.tar.bz2 | |
drm: Pad drm_mode_get_connector to 64-bit boundary
commit bc5bd37ce48c66e9192ad2e7231e9678880f6f8e upstream.
Pavel Roskin reported that DRM_IOCTL_MODE_GETCONNECTOR was overwritting
the 4 bytes beyond the end of its structure with a 32-bit userspace
running on a 64-bit kernel. This is due to the padding gcc inserts as
the drm_mode_get_connector struct includes a u64 and its size is not a
natural multiple of u64s.
64-bit kernel:
sizeof(drm_mode_get_connector)=80, alignof=8
sizeof(drm_mode_get_encoder)=20, alignof=4
sizeof(drm_mode_modeinfo)=68, alignof=4
32-bit userspace:
sizeof(drm_mode_get_connector)=76, alignof=4
sizeof(drm_mode_get_encoder)=20, alignof=4
sizeof(drm_mode_modeinfo)=68, alignof=4
Fortuituously we can insert explicit padding to the tail of our
structures without breaking ABI.
Reported-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Airlie <airlied@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_mode.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 7639f18..8f4ae68 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -184,6 +184,8 @@ struct drm_mode_get_connector { __u32 connection; __u32 mm_width, mm_height; /**< HxW in millimeters */ __u32 subpixel; + + __u32 pad; }; #define DRM_MODE_PROP_PENDING (1<<0) |