diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-01-28 10:08:52 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-01-28 10:27:24 +0100 |
| commit | db41fd66b3b56ef1f33ac2ef9eacb33d41cd1738 (patch) | |
| tree | 55c9bc1528bff933cf9feea4f270e21cb272d9e2 | |
| parent | 8c8b350b079619edde97e0c11b90f85062532911 (diff) | |
linux-toradex-mainline: update to 4.14.168
Remove upstreamed patch: Commit acab21ffa8c0951f2180f80184c921fa4799c786
'mmc: core: fix possible use after free of host' fixes the issue with
the same change as 0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch | 31 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-toradex-mainline_4.14.bb | 7 |
2 files changed, 3 insertions, 35 deletions
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch deleted file mode 100644 index dd8d127..0000000 --- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 12e25f531b9d910ed72ad5b6dd5e5b36a3f664aa Mon Sep 17 00:00:00 2001 -Message-Id: <12e25f531b9d910ed72ad5b6dd5e5b36a3f664aa.1531317141.git.marcel.ziswiler@toradex.com> -In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com> -References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com> -From: Marcel Ziswiler <marcel.ziswiler@toradex.com> -Date: Thu, 19 Apr 2018 13:49:00 +0200 -Subject: [PATCH 15/33] Revert "mmc: core: fix error path in mmc_host_alloc" - -This reverts commit 1ed2171944888cf6787990a0f6387b717ba72e24. - -Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> ---- - drivers/mmc/core/host.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index ad88deb2e8f3..3740fb0052a4 100644 ---- a/drivers/mmc/core/host.c -+++ b/drivers/mmc/core/host.c -@@ -376,8 +376,6 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) - - if (mmc_gpio_alloc(host)) { - put_device(&host->class_dev); -- ida_simple_remove(&mmc_host_ida, host->index); -- kfree(host); - return NULL; - } - --- -2.14.4 - diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb index 9b8d2bf..35bdbac 100644 --- a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb +++ b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" inherit kernel siteinfo -LINUX_VERSION ?= "4.14.160" +LINUX_VERSION ?= "4.14.168" LOCALVERSION = "-${PR}" PR = "${TDX_VER_ITEM}" @@ -30,7 +30,6 @@ GENERIC_PATCHES = " \ file://0012-apalis-tk1-support-for-k20-mfd.patch \ file://0013-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra30.patch \ file://0014-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra114-124.patch \ - file://0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch \ file://0016-Revert-mmc-core-simplify-ida-handling.patch \ file://0017-mmc-read-mmc-alias-from-device-tree.patch \ file://0018-apalis-t30-mainline-force-fixed-ids-for-sdmmc-contro.patch \ @@ -59,8 +58,8 @@ SRC_URI = " \ ${GENERIC_PATCHES} \ ${MACHINE_PATCHES} \ " -SRC_URI[md5sum] = "286501d9badbb724fddbc6e20e46aa1e" -SRC_URI[sha256sum] = "c60326bad1bcdede514ca8a0bb96843fa7578ef00829cced6218b888b2efa92c" +SRC_URI[md5sum] = "e3447527902445b779f5eff66de5bc8c" +SRC_URI[sha256sum] = "db5777d3a12a85bc8c130b7b250bab2283f9d964b725e5de3c216b495eeb31fe" # For CI use one could use the following instead (plus patches still of course) LINUX_VERSION_use-head-next ?= "4.14" |