Messages in this thread | | | Subject | Re: [PATCH v2] media: media-device: fix ioctl function types | From | Hans Verkuil <> | Date | Tue, 8 May 2018 10:08:41 +0200 |
| |
Hi Sami,
This is unchanged from the previous version, right? I've already added that to a pull request.
If this v2 has changes, then let me know asap.
Regards,
Hans
On 05/07/2018 08:09 PM, Sami Tolvanen wrote: > This change fixes function types for media device ioctls to avoid > indirect call mismatches with Control-Flow Integrity checking. > > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> > --- > drivers/media/media-device.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c > index 35e81f7c0d2f1..ae59c31775557 100644 > --- a/drivers/media/media-device.c > +++ b/drivers/media/media-device.c > @@ -54,9 +54,10 @@ static int media_device_close(struct file *filp) > return 0; > } > > -static int media_device_get_info(struct media_device *dev, > - struct media_device_info *info) > +static long media_device_get_info(struct media_device *dev, void *arg) > { > + struct media_device_info *info = arg; > + > memset(info, 0, sizeof(*info)); > > if (dev->driver_name[0]) > @@ -93,9 +94,9 @@ static struct media_entity *find_entity(struct media_device *mdev, u32 id) > return NULL; > } > > -static long media_device_enum_entities(struct media_device *mdev, > - struct media_entity_desc *entd) > +static long media_device_enum_entities(struct media_device *mdev, void *arg) > { > + struct media_entity_desc *entd = arg; > struct media_entity *ent; > > ent = find_entity(mdev, entd->id); > @@ -146,9 +147,9 @@ static void media_device_kpad_to_upad(const struct media_pad *kpad, > upad->flags = kpad->flags; > } > > -static long media_device_enum_links(struct media_device *mdev, > - struct media_links_enum *links) > +static long media_device_enum_links(struct media_device *mdev, void *arg) > { > + struct media_links_enum *links = arg; > struct media_entity *entity; > > entity = find_entity(mdev, links->entity); > @@ -195,9 +196,9 @@ static long media_device_enum_links(struct media_device *mdev, > return 0; > } > > -static long media_device_setup_link(struct media_device *mdev, > - struct media_link_desc *linkd) > +static long media_device_setup_link(struct media_device *mdev, void *arg) > { > + struct media_link_desc *linkd = arg; > struct media_link *link = NULL; > struct media_entity *source; > struct media_entity *sink; > @@ -225,9 +226,9 @@ static long media_device_setup_link(struct media_device *mdev, > return __media_entity_setup_link(link, linkd->flags); > } > > -static long media_device_get_topology(struct media_device *mdev, > - struct media_v2_topology *topo) > +static long media_device_get_topology(struct media_device *mdev, void *arg) > { > + struct media_v2_topology *topo = arg; > struct media_entity *entity; > struct media_interface *intf; > struct media_pad *pad; >
| |