diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-11-10 15:33:17 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-11-16 09:35:05 +0100 |
commit | ac5297340e647c63f98278eadc2f189608d4cd62 (patch) | |
tree | ab0ca9c4b4c1f962d790b2bd9d8055b2e041e80e /target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch | |
parent | 589c3cf4e08731e4971d2db6c83e16b5ab959878 (diff) | |
download | upstream-ac5297340e647c63f98278eadc2f189608d4cd62.tar.gz upstream-ac5297340e647c63f98278eadc2f189608d4cd62.tar.bz2 upstream-ac5297340e647c63f98278eadc2f189608d4cd62.zip |
kernel: bump 4.14 to 4.14.206
Refreshed all patches.
Altered patches:
- 210-dwc2_defaults.patch
- 708-mc-bus-support-layerscape.patch
Fixes:
- CVE-2020-25656
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch')
-rw-r--r-- | target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch b/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch index 129b8ecc64..7c6e25b038 100644 --- a/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch @@ -8611,7 +8611,7 @@ Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com> +} --- a/drivers/staging/fsl-mc/bus/mc-io.c +++ /dev/null -@@ -1,292 +0,0 @@ +@@ -1,297 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) -/* - * Copyright 2013-2016 Freescale Semiconductor Inc. @@ -8754,7 +8754,12 @@ Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com> - */ -void fsl_destroy_mc_io(struct fsl_mc_io *mc_io) -{ -- struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; +- struct fsl_mc_device *dpmcp_dev; +- +- if (!mc_io) +- return; +- +- dpmcp_dev = mc_io->dpmcp_dev; - - if (dpmcp_dev) - fsl_mc_io_unset_dpmcp(mc_io); |