From: Greg Kroah-Hartman Date: Wed, 19 Jun 2019 17:17:16 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.1.13~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44aa7eeb48d304381c6145a44d660fd3761a2033;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch --- diff --git a/queue-4.9/revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch b/queue-4.9/revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch new file mode 100644 index 00000000000..15ec7d3d3f4 --- /dev/null +++ b/queue-4.9/revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch @@ -0,0 +1,45 @@ +From 9a0c16060094eab93f6d928e72f7e8c1cd67a9f8 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Wed, 19 Jun 2019 19:15:29 +0200 +Subject: Revert "staging: vc04_services: prevent integer overflow in create_pagelist()" + +From: Greg Kroah-Hartman + +This reverts commit cf07331c8827c9e9e0b4274c9b60204c18592241 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: Martin Weinelt +Cc: Dan Carpenter +Signed-off-by: Greg Kroah-Hartman +--- + drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 9 --------- + 1 file changed, 9 deletions(-) + +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +@@ -381,18 +381,9 @@ create_pagelist(char __user *buf, size_t + 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 diff --git a/queue-4.9/series b/queue-4.9/series index 0b7482f28cc..57a042a107b 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -93,3 +93,4 @@ ipv6-flowlabel-fl6_sock_lookup-must-use-atomic_inc_not_zero.patch lapb-fixed-leak-of-control-blocks.patch neigh-fix-use-after-free-read-in-pneigh_get_next.patch sunhv-fix-device-naming-inconsistency-between-sunhv_console-and-sunhv_reg.patch +revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch