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

Commit be89df3e authored by Vishwanatha Kumar Ulthur's avatar Vishwanatha Kumar Ulthur Committed by Akhila Musunuri
Browse files

Revert "[media] v4l2: Fix the possible memory leak in v4l2 framework" 



This reverts commit b97a2097
Reverting the change to address the regressions in Audio, Video
and camera functionalities

Change-Id: I4214f8f07faf7d380e5ebfeb2ef997323ab045c8
Signed-off-by: default avatarAkhila Musunuri <makhila@codeaurora.org>
parent 082d3f95

drivers/media/v4l2-core/v4l2-ioctl.c

+0 −4
Original line number Diff line number Diff line
@@ -2331,7 +2331,6 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg, 
	size_t  array_size = 0;

	void __user *user_ptr = NULL;

	void	**kernel_ptr = NULL;

	bool	heap_allocate = false;



	/*  Copy arguments into temp kernel buffer  */

	if (_IOC_DIR(cmd) != _IOC_NONE) {
@@ -2343,7 +2342,6 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg, 
			if (NULL == mbuf)

				return -ENOMEM;

			parg = mbuf;

			heap_allocate = true;

		}



		err = -EFAULT;
@@ -2425,8 +2423,6 @@ out_array_args: 


out:

	kfree(mbuf);

	if (heap_allocate)

		kfree(parg);

	return err;

}

EXPORT_SYMBOL(video_usercopy);