From 401f69308fe344b4353fad5233d99c7efa9deef5 Mon Sep 17 00:00:00 2001 From: Yong Zhi Date: Fri, 19 Jan 2018 01:27:34 -0500 Subject: media: intel-ipu3: cio2: fixup off-by-one bug in cio2_vb2_buf_init With "pages" initialized to vb length + 1 pages, the condition check if(!pages--) will break at one more page than intended, this can result in out-of-bound access to b->lop[i][j] when setting the last dummy page. Fixes: c7cbef1fdb54 ("media: intel-ipu3: cio2: fix a crash with out-of-bounds access") Signed-off-by: Yong Zhi Signed-off-by: Cao Bing Bu Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/media') diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c index 724cd8d9d573..6c4444b31f4b 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c @@ -839,9 +839,8 @@ static int cio2_vb2_buf_init(struct vb2_buffer *vb) container_of(vb, struct cio2_buffer, vbb.vb2_buf); static const unsigned int entries_per_page = CIO2_PAGE_SIZE / sizeof(u32); - unsigned int pages = DIV_ROUND_UP(vb->planes[0].length, - CIO2_PAGE_SIZE) + 1; - unsigned int lops = DIV_ROUND_UP(pages, entries_per_page); + unsigned int pages = DIV_ROUND_UP(vb->planes[0].length, CIO2_PAGE_SIZE); + unsigned int lops = DIV_ROUND_UP(pages + 1, entries_per_page); struct sg_table *sg; struct sg_page_iter sg_iter; int i, j; -- cgit v1.2.3