mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 05:18:55 +00:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
56 lines
2 KiB
Diff
56 lines
2 KiB
Diff
From 491af9a7e7ccddb1c3045c7f9cd2990f6d22154f Mon Sep 17 00:00:00 2001
|
|
From: Andreas Baierl <ichgeh@imkreisrum.de>
|
|
Date: Tue, 16 Oct 2018 03:19:20 -0400
|
|
Subject: [PATCH 125/146] drm/lima: Fix lima cache creation
|
|
|
|
Due to the kernel merge of the hardened usercopy patch set
|
|
we have to whitelist the memory area which is used for
|
|
copy_from_user actions. Otherwise lima fails with an abort
|
|
and segmentation fault.
|
|
|
|
This is necessary on systems with CONFIG_HARDENED_USERCOPY enabled.
|
|
It was tested on a Cubieboard 1, Allwinner A10.
|
|
|
|
Signed-off-by: Andreas Baierl <ichgeh@imkreisrum.de>
|
|
---
|
|
drivers/gpu/drm/lima/lima_gp.c | 5 +++--
|
|
drivers/gpu/drm/lima/lima_pp.c | 5 +++--
|
|
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/lima/lima_gp.c b/drivers/gpu/drm/lima/lima_gp.c
|
|
index 706652cb1741..6c902648e5cd 100644
|
|
--- a/drivers/gpu/drm/lima/lima_gp.c
|
|
+++ b/drivers/gpu/drm/lima/lima_gp.c
|
|
@@ -245,9 +245,10 @@ int lima_gp_pipe_init(struct lima_device *dev)
|
|
struct lima_sched_pipe *pipe = dev->pipe + lima_pipe_gp;
|
|
|
|
if (!lima_gp_task_slab) {
|
|
- lima_gp_task_slab = kmem_cache_create(
|
|
+ lima_gp_task_slab = kmem_cache_create_usercopy(
|
|
"lima_gp_task", sizeof(struct lima_sched_task) + frame_size,
|
|
- 0, SLAB_HWCACHE_ALIGN, NULL);
|
|
+ 0, SLAB_HWCACHE_ALIGN, sizeof(struct lima_sched_task),
|
|
+ frame_size, NULL);
|
|
if (!lima_gp_task_slab)
|
|
return -ENOMEM;
|
|
}
|
|
diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c
|
|
index 3355895ceeba..502190d1bf3f 100644
|
|
--- a/drivers/gpu/drm/lima/lima_pp.c
|
|
+++ b/drivers/gpu/drm/lima/lima_pp.c
|
|
@@ -383,9 +383,10 @@ int lima_pp_pipe_init(struct lima_device *dev)
|
|
frame_size = sizeof(struct drm_lima_m450_pp_frame);
|
|
|
|
if (!lima_pp_task_slab) {
|
|
- lima_pp_task_slab = kmem_cache_create(
|
|
+ lima_pp_task_slab = kmem_cache_create_usercopy(
|
|
"lima_pp_task", sizeof(struct lima_sched_task) + frame_size,
|
|
- 0, SLAB_HWCACHE_ALIGN, NULL);
|
|
+ 0, SLAB_HWCACHE_ALIGN, sizeof(struct lima_sched_task),
|
|
+ frame_size, NULL);
|
|
if (!lima_pp_task_slab)
|
|
return -ENOMEM;
|
|
}
|
|
--
|
|
2.17.1
|
|
|