Commit daa36370 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Mauro Carvalho Chehab

media: media-device: fix ioctl function types

This change fixes function types for media device ioctls to avoid
indirect call mismatches with Control-Flow Integrity checking.
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 5b817555
...@@ -54,9 +54,10 @@ static int media_device_close(struct file *filp) ...@@ -54,9 +54,10 @@ static int media_device_close(struct file *filp)
return 0; return 0;
} }
static int media_device_get_info(struct media_device *dev, static long media_device_get_info(struct media_device *dev, void *arg)
struct media_device_info *info)
{ {
struct media_device_info *info = arg;
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
if (dev->driver_name[0]) if (dev->driver_name[0])
...@@ -93,9 +94,9 @@ static struct media_entity *find_entity(struct media_device *mdev, u32 id) ...@@ -93,9 +94,9 @@ static struct media_entity *find_entity(struct media_device *mdev, u32 id)
return NULL; return NULL;
} }
static long media_device_enum_entities(struct media_device *mdev, static long media_device_enum_entities(struct media_device *mdev, void *arg)
struct media_entity_desc *entd)
{ {
struct media_entity_desc *entd = arg;
struct media_entity *ent; struct media_entity *ent;
ent = find_entity(mdev, entd->id); ent = find_entity(mdev, entd->id);
...@@ -146,9 +147,9 @@ static void media_device_kpad_to_upad(const struct media_pad *kpad, ...@@ -146,9 +147,9 @@ static void media_device_kpad_to_upad(const struct media_pad *kpad,
upad->flags = kpad->flags; upad->flags = kpad->flags;
} }
static long media_device_enum_links(struct media_device *mdev, static long media_device_enum_links(struct media_device *mdev, void *arg)
struct media_links_enum *links)
{ {
struct media_links_enum *links = arg;
struct media_entity *entity; struct media_entity *entity;
entity = find_entity(mdev, links->entity); entity = find_entity(mdev, links->entity);
...@@ -195,9 +196,9 @@ static long media_device_enum_links(struct media_device *mdev, ...@@ -195,9 +196,9 @@ static long media_device_enum_links(struct media_device *mdev,
return 0; return 0;
} }
static long media_device_setup_link(struct media_device *mdev, static long media_device_setup_link(struct media_device *mdev, void *arg)
struct media_link_desc *linkd)
{ {
struct media_link_desc *linkd = arg;
struct media_link *link = NULL; struct media_link *link = NULL;
struct media_entity *source; struct media_entity *source;
struct media_entity *sink; struct media_entity *sink;
...@@ -225,9 +226,9 @@ static long media_device_setup_link(struct media_device *mdev, ...@@ -225,9 +226,9 @@ static long media_device_setup_link(struct media_device *mdev,
return __media_entity_setup_link(link, linkd->flags); return __media_entity_setup_link(link, linkd->flags);
} }
static long media_device_get_topology(struct media_device *mdev, static long media_device_get_topology(struct media_device *mdev, void *arg)
struct media_v2_topology *topo)
{ {
struct media_v2_topology *topo = arg;
struct media_entity *entity; struct media_entity *entity;
struct media_interface *intf; struct media_interface *intf;
struct media_pad *pad; struct media_pad *pad;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment