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

Commit 4d8d4137 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "staging: vc04_services: prevent integer overflow in create_pagelist()" 



This reverts commit cf07331c which was
commit ca641bae6da977d638458e78cd1487b6160a2718 upstream.

Martin writes:
	This commit breaks the kernel build because the vchiq_pagelist_info
	struct is not defined in v4.9.182.

	It was only added in v4.10, in commit
	4807f2c0e684e907c501cb96049809d7a957dbc2.

Reported-by: default avatarMartin Weinelt <martin@linuxlounge.net>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce8bda09

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c

+0 −9
Original line number Diff line number Diff line
@@ -381,18 +381,9 @@ create_pagelist(char __user *buf, size_t count, unsigned short type, 
	int run, addridx, actual_pages;

        unsigned long *need_release;



	if (count >= INT_MAX - PAGE_SIZE)

		return NULL;



	offset = (unsigned int)buf & (PAGE_SIZE - 1);

	num_pages = (count + offset + PAGE_SIZE - 1) / PAGE_SIZE;



	if (num_pages > (SIZE_MAX - sizeof(PAGELIST_T) -

			 sizeof(struct vchiq_pagelist_info)) /

			(sizeof(u32) + sizeof(pages[0]) +

			 sizeof(struct scatterlist)))

		return NULL;



	*ppagelist = NULL;



	/* Allocate enough storage to hold the page pointers and the page