Commit 6e6c4ae0 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Ensure that USERPTR pointers are page aligned 



The atomisp code needs USERPTR pointers to be page aligned,
otherwise bad things (scribbling over other parts of the
process' RAM) happen.

Add a check to ensure this and exit VIDIOC_QBUF calls with
unaligned pointers with -EINVAL.

Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 30cf7e90

drivers/staging/media/atomisp/pci/atomisp_ioctl.c

+6 −0
Original line number Diff line number Diff line
@@ -1345,6 +1345,12 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf) 
	 * address and reprograme out page table properly

	 */

	if (buf->memory == V4L2_MEMORY_USERPTR) {

		if (offset_in_page(buf->m.userptr)) {

			dev_err(isp->dev, "Error userptr is not page aligned.\n");

			ret = -EINVAL;

			goto error;

		}



		vb = pipe->capq.bufs[buf->index];

		vm_mem = vb->priv;

		if (!vm_mem) {