Merge "[media] media: info leak in __media_device_enum_links()" (631bcaf1) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/media-device.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,8 @@ static long __media_device_enum_links(struct media_device *mdev,

		for (p = 0; p < entity->num_pads; p++) {
		struct media_pad_desc pad;

		memset(&pad, 0, sizeof(pad));
		media_device_kpad_to_upad(&entity->pads[p], &pad);
		if (copy_to_user(&links->pads[p], &pad, sizeof(pad)))
		return -EFAULT;
		@@ -159,6 +161,7 @@ static long __media_device_enum_links(struct media_device *mdev,
		if (entity->links[l].source->entity != entity)
		continue;

		memset(&link, 0, sizeof(link));
		media_device_kpad_to_upad(entity->links[l].source,
		&link.source);
		media_device_kpad_to_upad(entity->links[l].sink,