diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-09-04 19:01:23 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-09-04 19:02:48 +0200 |
| commit | 662394fb30fdbcc89ec387918714aebee6868a9f (patch) | |
| tree | c308c5f1a650abf9d9ccbb2a1747469a0d8570c0 /target/linux/brcm2708/patches-4.19/950-0367-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch | |
| parent | 99a5e285887c4a10aaf06d8e01fae0707995da00 (diff) | |
| download | upstream-662394fb30fdbcc89ec387918714aebee6868a9f.tar.gz upstream-662394fb30fdbcc89ec387918714aebee6868a9f.tar.bz2 upstream-662394fb30fdbcc89ec387918714aebee6868a9f.zip | |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0367-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0367-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0367-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch b/target/linux/brcm2708/patches-4.19/950-0367-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch new file mode 100644 index 0000000000..aedf11d303 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0367-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch @@ -0,0 +1,44 @@ +From b67424dd64ed7700e9316975511b6388f1a31130 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.org> +Date: Fri, 8 Mar 2019 10:38:59 +0000 +Subject: [PATCH 367/782] staging: vc_sm_cma: Remove erroneous misc_deregister + +Code from the misc /dev node was still present in +bcm2835_vc_sm_cma_remove, which caused a NULL deref. +Remove it. + +See #2885. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> +--- + drivers/staging/vc04_services/vc-sm-cma/vc_sm.c | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c ++++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c +@@ -25,7 +25,6 @@ + #include <linux/fs.h> + #include <linux/kernel.h> + #include <linux/list.h> +-#include <linux/miscdevice.h> + #include <linux/module.h> + #include <linux/mm.h> + #include <linux/of_device.h> +@@ -72,7 +71,6 @@ struct sm_pde_t { + struct sm_state_t { + struct platform_device *pdev; + +- struct miscdevice dev; + struct sm_instance *sm_handle; /* Handle for videocore service. */ + + spinlock_t kernelid_map_lock; /* Spinlock protecting kernelid_map */ +@@ -758,9 +756,6 @@ static int bcm2835_vc_sm_cma_remove(stru + { + pr_debug("[%s]: start\n", __func__); + if (sm_inited) { +- /* Remove shared memory device. */ +- misc_deregister(&sm_state->dev); +- + /* Remove all proc entries. */ + //debugfs_remove_recursive(sm_state->dir_root); + |