Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2015-06-15 18:18:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2015-06-12 20:30:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2015-06-15 18:18:20.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 12 11:50:05 CEST 2015 - [email protected] + +- mmc: sdhci: fix low memory corruption (bnc#934531). +- commit 0e899eb + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa-xen.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-pv.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.kF4945/_old 2015-06-15 18:18:40.000000000 +0200 +++ /var/tmp/diff_new_pack.kF4945/_new 2015-06-15 18:18:40.000000000 +0200 @@ -61,7 +61,7 @@ Group: System/Kernel Version: 4.0.5 %if 0%{?is_kotd} -Release: <RELEASE>.gf4cd21b +Release: <RELEASE>.g0e899eb %else Release: 0 %endif kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.kF4945/_old 2015-06-15 18:18:40.000000000 +0200 +++ /var/tmp/diff_new_pack.kF4945/_new 2015-06-15 18:18:40.000000000 +0200 @@ -29,7 +29,7 @@ Group: Documentation/Man Version: 4.0.5 %if 0%{?is_kotd} -Release: <RELEASE>.gf4cd21b +Release: <RELEASE>.g0e899eb %else Release: 0 %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.kF4945/_old 2015-06-15 18:18:40.000000000 +0200 +++ /var/tmp/diff_new_pack.kF4945/_new 2015-06-15 18:18:40.000000000 +0200 @@ -61,7 +61,7 @@ Group: System/Kernel Version: 4.0.5 %if 0%{?is_kotd} -Release: <RELEASE>.gf4cd21b +Release: <RELEASE>.g0e899eb %else Release: 0 %endif kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.kF4945/_old 2015-06-15 18:18:40.000000000 +0200 +++ /var/tmp/diff_new_pack.kF4945/_new 2015-06-15 18:18:40.000000000 +0200 @@ -47,7 +47,7 @@ Group: SLES Version: 4.0.5 %if 0%{?is_kotd} -Release: <RELEASE>.gf4cd21b +Release: <RELEASE>.g0e899eb %else Release: 0 %endif kernel-obs-qa-xen.spec: same change kernel-obs-qa.spec: same change ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.kF4945/_old 2015-06-15 18:18:40.000000000 +0200 +++ /var/tmp/diff_new_pack.kF4945/_new 2015-06-15 18:18:40.000000000 +0200 @@ -61,7 +61,7 @@ Group: System/Kernel Version: 4.0.5 %if 0%{?is_kotd} -Release: <RELEASE>.gf4cd21b +Release: <RELEASE>.g0e899eb %else Release: 0 %endif kernel-pv.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.kF4945/_old 2015-06-15 18:18:40.000000000 +0200 +++ /var/tmp/diff_new_pack.kF4945/_new 2015-06-15 18:18:40.000000000 +0200 @@ -32,7 +32,7 @@ Group: Development/Sources Version: 4.0.5 %if 0%{?is_kotd} -Release: <RELEASE>.gf4cd21b +Release: <RELEASE>.g0e899eb %else Release: 0 %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.kF4945/_old 2015-06-15 18:18:40.000000000 +0200 +++ /var/tmp/diff_new_pack.kF4945/_new 2015-06-15 18:18:40.000000000 +0200 @@ -27,7 +27,7 @@ Version: 4.0.5 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.gf4cd21b +Release: <RELEASE>.g0e899eb %else Release: 0 %endif ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.kF4945/_old 2015-06-15 18:18:40.000000000 +0200 +++ /var/tmp/diff_new_pack.kF4945/_new 2015-06-15 18:18:40.000000000 +0200 @@ -61,7 +61,7 @@ Group: System/Kernel Version: 4.0.5 %if 0%{?is_kotd} -Release: <RELEASE>.gf4cd21b +Release: <RELEASE>.g0e899eb %else Release: 0 %endif kernel-xen.spec: same change ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/mmc-sdhci-fix-low-memory-corruption.patch new/patches.fixes/mmc-sdhci-fix-low-memory-corruption.patch --- old/patches.fixes/mmc-sdhci-fix-low-memory-corruption.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/mmc-sdhci-fix-low-memory-corruption.patch 2015-06-12 11:50:14.000000000 +0200 @@ -0,0 +1,55 @@ +From: Jiri Slaby <[email protected]> +Date: Fri, 12 Jun 2015 11:24:45 +0200 +Subject: mmc: sdhci: fix low memory corruption +Patch-mainline: not yet, submitted +References: bnc#934531 + +When dma mapping (dma_map_sg) fails in sdhci_pre_dma_transfer, -EINVAL +is returned. There are 3 callers of sdhci_pre_dma_transfer: +* sdhci_pre_req and sdhci_adma_table_pre: handle negative return +* sdhci_prepare_data: handles 0 (error) and "else" (good) only + +sdhci_prepare_data is therefore broken. When it receives -EINVAL from +sdhci_pre_dma_transfer, it assumes 1 sg mapping was mapped. Later, +this non-existant mapping with address 0 is kmap'ped and written to: +Corrupted low memory at ffff880000001000 (1000 phys) = 22b7d67df2f6d1cf +Corrupted low memory at ffff880000001008 (1008 phys) = 63848a5216b7dd95 +Corrupted low memory at ffff880000001010 (1010 phys) = 330eb7ddef39e427 +Corrupted low memory at ffff880000001018 (1018 phys) = 8017ac7295039bda +Corrupted low memory at ffff880000001020 (1020 phys) = 8ce039eac119074f +... + +So teach sdhci_prepare_data to understand negative return values from +sdhci_pre_dma_transfer and disable DMA in that case, as well as for +zero. + +It was introduced in 348487cb28e66b032bae1b38424d81bf5b444408 (mmc: +sdhci: use pipeline mmc requests to improve performance). The commit +seems to be suspicious also by assigning host->sg_count both in +sdhci_pre_dma_transfer and sdhci_adma_table_pre. + +Signed-off-by: Jiri Slaby <[email protected]> +Cc: [email protected] # 4.0+ +Fixes: 348487cb28e6 +Cc: Ulf Hansson <[email protected]> +Cc: Haibo Chen <[email protected]> +--- + drivers/mmc/host/sdhci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c +index 1b4861ddfb38..55e7f9a9858a 100644 +--- a/drivers/mmc/host/sdhci.c ++++ b/drivers/mmc/host/sdhci.c +@@ -834,7 +834,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) + int sg_cnt; + + sg_cnt = sdhci_pre_dma_transfer(host, data, NULL); +- if (sg_cnt == 0) { ++ if (sg_cnt <= 0) { + /* + * This only happens when someone fed + * us an invalid request. +-- +2.4.2 + ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.kF4945/_old 2015-06-15 18:18:41.000000000 +0200 +++ /var/tmp/diff_new_pack.kF4945/_new 2015-06-15 18:18:41.000000000 +0200 @@ -426,6 +426,7 @@ # Needs updating WRT d27769ec (block: add GENHD_FL_NO_PART_SCAN) +hare patches.suse/no-partition-scan + patches.fixes/mmc-sdhci-fix-low-memory-corruption.patch ######################################################## # Other drivers we have added to the tree ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.kF4945/_old 2015-06-15 18:18:41.000000000 +0200 +++ /var/tmp/diff_new_pack.kF4945/_new 2015-06-15 18:18:41.000000000 +0200 @@ -1,3 +1,3 @@ -2015-06-08 11:07:57 +0200 -GIT Revision: f4cd21b9c1ecf53f184e4311839313440756b225 +2015-06-12 11:50:14 +0200 +GIT Revision: 0e899eb6113c12cdf7dfde9632e6dacc92d591c9 GIT Branch: stable
