diff options
authorSakari Ailus <sakari.ailus@iki.fi>2016-03-03 14:20:14 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-03 18:10:53 -0300
commitfbe093ac9f0201939279cdfe8b0fce20ce5ef7a9 (patch)
parent93125094c07d8c9ec25dff5869f191b33eb9dd6e (diff)
[media] media: Sanitise the reserved fields of the G_TOPOLOGY IOCTL argumentsmedia/v4.5-4
The argument structs are used in arrays for G_TOPOLOGY IOCTL. The arguments themselves do not need to be aligned to a power of two, but aligning them up to the largest basic type alignment (u64) on common ABIs is a good thing to do. The patch changes the size of the reserved fields to 5 or 6 u32's and aligns the size of the struct to 8 bytes so we do no longer depend on the compiler to perform the alignment. While at it, add __attribute__ ((packed)) to these structs as well. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
1 files changed, 9 insertions, 9 deletions
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 323f1af35062..625b38f65764 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -297,14 +297,14 @@ struct media_v2_entity {
__u32 id;
char name[64]; /* FIXME: move to a property? (RFC says so) */
__u32 function; /* Main function of the entity */
- __u16 reserved[12];
+ __u32 reserved[6];
+} __attribute__ ((packed));
/* Should match the specific fields at media_intf_devnode */
struct media_v2_intf_devnode {
__u32 major;
__u32 minor;
+} __attribute__ ((packed));
struct media_v2_interface {
__u32 id;
@@ -316,22 +316,22 @@ struct media_v2_interface {
struct media_v2_intf_devnode devnode;
__u32 raw[16];
+} __attribute__ ((packed));
struct media_v2_pad {
__u32 id;
__u32 entity_id;
__u32 flags;
- __u16 reserved[9];
+ __u32 reserved[5];
+} __attribute__ ((packed));
struct media_v2_link {
__u32 id;
__u32 source_id;
__u32 sink_id;
__u32 flags;
- __u32 reserved[5];
+ __u32 reserved[6];
+} __attribute__ ((packed));
struct media_v2_topology {
__u64 topology_version;
@@ -351,7 +351,7 @@ struct media_v2_topology {
__u32 num_links;
__u32 reserved4;
__u64 ptr_links;
+} __attribute__ ((packed));
static inline void __user *media_get_uptr(__u64 arg)

Privacy Policy