diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 11:09:27 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 11:09:27 -0400 |
| commit | bc06cb297bd7b5f6b5060130368bd75aa71ed38e (patch) | |
| tree | 10e74847bb6e1c2236cc08d79215d13258445380 | |
| parent | e8b47165c3f064cbbfd4b4dedcd96ab63e9ce3cb (diff) | |
| download | longterm-queue-4.18-bc06cb297bd7b5f6b5060130368bd75aa71ed38e.tar.gz | |
staging: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/staging-vc04_services-prevent-integer-overflow-in-cr.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/staging-vc04_services-prevent-integer-overflow-in-cr.patch b/queue/staging-vc04_services-prevent-integer-overflow-in-cr.patch index cb8ceb9..40075fc 100644 --- a/queue/staging-vc04_services-prevent-integer-overflow-in-cr.patch +++ b/queue/staging-vc04_services-prevent-integer-overflow-in-cr.patch @@ -1,4 +1,4 @@ -From ca641bae6da977d638458e78cd1487b6160a2718 Mon Sep 17 00:00:00 2001 +From fd4ae1a37e5e94d5888d77214dcaec4db728cd43 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Wed, 15 May 2019 12:38:33 +0300 Subject: [PATCH] staging: vc04_services: prevent integer overflow in @@ -28,10 +28,10 @@ Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c -index a9a22917ecdb..c557c9953724 100644 +index c7c8ef67b67f..95b38d6487d9 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c -@@ -368,9 +368,18 @@ create_pagelist(char __user *buf, size_t count, unsigned short type) +@@ -410,9 +410,18 @@ create_pagelist(char __user *buf, size_t count, unsigned short type) int dma_buffers; dma_addr_t dma_addr; @@ -47,9 +47,9 @@ index a9a22917ecdb..c557c9953724 100644 + sizeof(struct scatterlist))) + return NULL; + - pagelist_size = sizeof(struct pagelist) + + pagelist_size = sizeof(PAGELIST_T) + (num_pages * sizeof(u32)) + (num_pages * sizeof(pages[0]) + -- -2.9.5 +2.7.4 |