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

Commit a5c82e56 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

[media] media-device: copy_to/from_user() returns positive 



The copy_to/from_user() functions return the number of bytes *not*
copied.  They don't return error codes.

Fixes: 4f6b3f363475 ('media] media-device: add support for MEDIA_IOC_G_TOPOLOGY ioctl')

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 8a950796

drivers/media/media-device.c

+5 −6
Original line number Diff line number Diff line
@@ -376,18 +376,17 @@ static long media_device_get_topology(struct media_device *mdev, 
	struct media_v2_topology ktopo;

	int ret;



	ret = copy_from_user(&ktopo, utopo, sizeof(ktopo));



	if (ret < 0)

		return ret;

	if (copy_from_user(&ktopo, utopo, sizeof(ktopo)))

		return -EFAULT;



	ret = __media_device_get_topology(mdev, &ktopo);

	if (ret < 0)

		return ret;



	ret = copy_to_user(utopo, &ktopo, sizeof(*utopo));

	if (copy_to_user(utopo, &ktopo, sizeof(*utopo)))

		return -EFAULT;



	return ret;

	return 0;

}



static long media_device_ioctl(struct file *filp, unsigned int cmd,