Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3b7a9f1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] media-device: Use u64 ints for pointers 



By using u64 integers and pointers, we can get rid of compat32
logic. So, let's do it!

Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent d1b9da2d

drivers/media/media-device.c

+41 −36
Original line number Diff line number Diff line
@@ -240,10 +240,10 @@ static long __media_device_get_topology(struct media_device *mdev, 
	struct media_interface *intf;

	struct media_pad *pad;

	struct media_link *link;

	struct media_v2_entity uentity;

	struct media_v2_interface uintf;

	struct media_v2_pad upad;

	struct media_v2_link ulink;

	struct media_v2_entity kentity, *uentity;

	struct media_v2_interface kintf, *uintf;

	struct media_v2_pad kpad, *upad;

	struct media_v2_link klink, *ulink;

	unsigned int i;

	int ret = 0;
@@ -251,10 +251,10 @@ static long __media_device_get_topology(struct media_device *mdev, 


	/* Get entities and number of entities */

	i = 0;

	uentity = media_get_uptr(topo->ptr_entities);

	media_device_for_each_entity(entity, mdev) {

		i++;



		if (ret || !topo->entities)

		if (ret || !uentity)

			continue;



		if (i > topo->num_entities) {
@@ -263,23 +263,24 @@ static long __media_device_get_topology(struct media_device *mdev, 
		}



		/* Copy fields to userspace struct if not error */

		memset(&uentity, 0, sizeof(uentity));

		uentity.id = entity->graph_obj.id;

		uentity.function = entity->function;

		strncpy(uentity.name, entity->name,

			sizeof(uentity.name));

		memset(&kentity, 0, sizeof(kentity));

		kentity.id = entity->graph_obj.id;

		kentity.function = entity->function;

		strncpy(kentity.name, entity->name,

			sizeof(kentity.name));



		if (copy_to_user(&topo->entities[i - 1], &uentity, sizeof(uentity)))

		if (copy_to_user(uentity, &kentity, sizeof(kentity)))

			ret = -EFAULT;

		uentity++;

	}

	topo->num_entities = i;



	/* Get interfaces and number of interfaces */

	i = 0;

	uintf = media_get_uptr(topo->ptr_interfaces);

	media_device_for_each_intf(intf, mdev) {

		i++;



		if (ret || !topo->interfaces)

		if (ret || !uintf)

			continue;



		if (i > topo->num_interfaces) {
@@ -287,33 +288,34 @@ static long __media_device_get_topology(struct media_device *mdev, 
			continue;

		}



		memset(&uintf, 0, sizeof(uintf));

		memset(&kintf, 0, sizeof(kintf));



		/* Copy intf fields to userspace struct */

		uintf.id = intf->graph_obj.id;

		uintf.intf_type = intf->type;

		uintf.flags = intf->flags;

		kintf.id = intf->graph_obj.id;

		kintf.intf_type = intf->type;

		kintf.flags = intf->flags;



		if (media_type(&intf->graph_obj) == MEDIA_GRAPH_INTF_DEVNODE) {

			struct media_intf_devnode *devnode;



			devnode = intf_to_devnode(intf);



			uintf.devnode.major = devnode->major;

			uintf.devnode.minor = devnode->minor;

			kintf.devnode.major = devnode->major;

			kintf.devnode.minor = devnode->minor;

		}



		if (copy_to_user(&topo->interfaces[i - 1], &uintf, sizeof(uintf)))

		if (copy_to_user(uintf, &kintf, sizeof(kintf)))

			ret = -EFAULT;

		uintf++;

	}

	topo->num_interfaces = i;



	/* Get pads and number of pads */

	i = 0;

	upad = media_get_uptr(topo->ptr_pads);

	media_device_for_each_pad(pad, mdev) {

		i++;



		if (ret || !topo->pads)

		if (ret || !upad)

			continue;



		if (i > topo->num_pads) {
@@ -321,27 +323,29 @@ static long __media_device_get_topology(struct media_device *mdev, 
			continue;

		}



		memset(&upad, 0, sizeof(upad));

		memset(&kpad, 0, sizeof(kpad));



		/* Copy pad fields to userspace struct */

		upad.id = pad->graph_obj.id;

		upad.entity_id = pad->entity->graph_obj.id;

		upad.flags = pad->flags;

		kpad.id = pad->graph_obj.id;

		kpad.entity_id = pad->entity->graph_obj.id;

		kpad.flags = pad->flags;



		if (copy_to_user(&topo->pads[i - 1], &upad, sizeof(upad)))

		if (copy_to_user(upad, &kpad, sizeof(kpad)))

			ret = -EFAULT;

		upad++;

	}

	topo->num_pads = i;



	/* Get links and number of links */

	i = 0;

	ulink = media_get_uptr(topo->ptr_links);

	media_device_for_each_link(link, mdev) {

		if (link->is_backlink)

			continue;



		i++;



		if (ret || !topo->links)

		if (ret || !ulink)

			continue;



		if (i > topo->num_links) {
@@ -349,19 +353,20 @@ static long __media_device_get_topology(struct media_device *mdev, 
			continue;

		}



		memset(&ulink, 0, sizeof(ulink));

		memset(&klink, 0, sizeof(klink));



		/* Copy link fields to userspace struct */

		ulink.id = link->graph_obj.id;

		ulink.source_id = link->gobj0->id;

		ulink.sink_id = link->gobj1->id;

		ulink.flags = link->flags;

		klink.id = link->graph_obj.id;

		klink.source_id = link->gobj0->id;

		klink.sink_id = link->gobj1->id;

		klink.flags = link->flags;



		if (media_type(link->gobj0) != MEDIA_GRAPH_PAD)

			ulink.flags |= MEDIA_LNK_FL_INTERFACE_LINK;

			klink.flags |= MEDIA_LNK_FL_INTERFACE_LINK;



		if (copy_to_user(&topo->links[i - 1], &ulink, sizeof(ulink)))

		if (copy_to_user(ulink, &klink, sizeof(klink)))

			ret = -EFAULT;

		ulink++;

	}

	topo->num_links = i;

include/uapi/linux/media.h

+17 −15
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
#ifndef __LINUX_MEDIA_H

#define __LINUX_MEDIA_H



#ifndef __KERNEL__

#include <stdint.h>

#endif

#include <linux/ioctl.h>

#include <linux/types.h>

#include <linux/version.h>
@@ -320,27 +323,26 @@ struct media_v2_link { 
};



struct media_v2_topology {

	__u32 topology_version;



	__u32 num_entities;

	struct media_v2_entity *entities;

	__u64 topology_version;



	__u32 num_interfaces;

	struct media_v2_interface *interfaces;

	__u64 num_entities;

	__u64 ptr_entities;



	__u32 num_pads;

	struct media_v2_pad *pads;

	__u64 num_interfaces;

	__u64 ptr_interfaces;



	__u32 num_links;

	struct media_v2_link *links;

	__u64 num_pads;

	__u64 ptr_pads;



	struct {

		__u32 reserved_num;

		void *reserved_ptr;

	} reserved_types[16];

	__u32 reserved[8];

	__u64 num_links;

	__u64 ptr_links;

};



static inline void __user *media_get_uptr(__u64 arg)

{

	return (void __user *)(uintptr_t)arg;

}



/* ioctls */



#define MEDIA_IOC_DEVICE_INFO		_IOWR('|', 0x00, struct media_device_info)