From: Greg Kroah-Hartman Date: Thu, 20 Mar 2014 18:09:27 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.4.84~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=996633752a2dcb3fec3e4cf21f010b335ec10168;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: drm-radeon-atom-select-the-proper-number-of-lanes-in.patch fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch iscsi-target-fix-iscsit_get_tpg_from_np-tpg_state-bug.patch --- diff --git a/queue-3.10/drm-radeon-atom-select-the-proper-number-of-lanes-in.patch b/queue-3.10/drm-radeon-atom-select-the-proper-number-of-lanes-in.patch new file mode 100644 index 00000000000..79625b17acc --- /dev/null +++ b/queue-3.10/drm-radeon-atom-select-the-proper-number-of-lanes-in.patch @@ -0,0 +1,34 @@ +From d03874c881a049a50e12f285077ab1f9fc2686e1 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Thu, 6 Mar 2014 18:09:52 -0500 +Subject: drm/radeon/atom: select the proper number of lanes in + transmitter setup + +From: Alex Deucher + +commit d03874c881a049a50e12f285077ab1f9fc2686e1 upstream. + +We need to check for DVI vs. HDMI when setting up duallink since +HDMI is single link only. Fixes 4k modes on newer asics. + +bug: +https://bugs.freedesktop.org/show_bug.cgi?id=75223 + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/radeon/atombios_encoders.c ++++ b/drivers/gpu/drm/radeon/atombios_encoders.c +@@ -1281,7 +1281,7 @@ atombios_dig_transmitter_setup(struct dr + } + if (is_dp) + args.v5.ucLaneNum = dp_lane_count; +- else if (radeon_encoder->pixel_clock > 165000) ++ else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock)) + args.v5.ucLaneNum = 8; + else + args.v5.ucLaneNum = 4; diff --git a/queue-3.10/fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch b/queue-3.10/fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch new file mode 100644 index 00000000000..d967ed24df7 --- /dev/null +++ b/queue-3.10/fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch @@ -0,0 +1,55 @@ +From 70335abb2689c8cd5df91bf2d95a65649addf50b Mon Sep 17 00:00:00 2001 +From: Artem Fetishev +Date: Mon, 10 Mar 2014 15:49:45 -0700 +Subject: fs/proc/base.c: fix GPF in /proc/$PID/map_files + +From: Artem Fetishev + +commit 70335abb2689c8cd5df91bf2d95a65649addf50b upstream. + +The expected logic of proc_map_files_get_link() is either to return 0 +and initialize 'path' or return an error and leave 'path' uninitialized. + +By the time dname_to_vma_addr() returns 0 the corresponding vma may have +already be gone. In this case the path is not initialized but the +return value is still 0. This results in 'general protection fault' +inside d_path(). + +Steps to reproduce: + + CONFIG_CHECKPOINT_RESTORE=y + + fd = open(...); + while (1) { + mmap(fd, ...); + munmap(fd, ...); + } + + ls -la /proc/$PID/map_files + +Addresses https://bugzilla.kernel.org/show_bug.cgi?id=68991 + +Signed-off-by: Artem Fetishev +Signed-off-by: Aleksandr Terekhov +Reported-by: +Acked-by: Pavel Emelyanov +Acked-by: Cyrill Gorcunov +Reviewed-by: "Eric W. Biederman" +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/proc/base.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/fs/proc/base.c ++++ b/fs/proc/base.c +@@ -1825,6 +1825,7 @@ static int proc_map_files_get_link(struc + if (rc) + goto out_mmput; + ++ rc = -ENOENT; + down_read(&mm->mmap_sem); + vma = find_exact_vma(mm, vm_start, vm_end); + if (vma && vma->vm_file) { diff --git a/queue-3.10/iscsi-target-fix-iscsit_get_tpg_from_np-tpg_state-bug.patch b/queue-3.10/iscsi-target-fix-iscsit_get_tpg_from_np-tpg_state-bug.patch new file mode 100644 index 00000000000..2799d8ad830 --- /dev/null +++ b/queue-3.10/iscsi-target-fix-iscsit_get_tpg_from_np-tpg_state-bug.patch @@ -0,0 +1,35 @@ +From a2a99cea5ec7c1e47825559f0e75a4efbcf8aee3 Mon Sep 17 00:00:00 2001 +From: Nicholas Bellinger +Date: Wed, 26 Feb 2014 03:09:41 -0800 +Subject: iscsi-target: Fix iscsit_get_tpg_from_np tpg_state bug + +From: Nicholas Bellinger + +commit a2a99cea5ec7c1e47825559f0e75a4efbcf8aee3 upstream. + +This patch fixes a bug in iscsit_get_tpg_from_np() where the +tpg->tpg_state sanity check was looking for TPG_STATE_FREE, +instead of != TPG_STATE_ACTIVE. + +The latter is expected during a normal TPG shutdown once the +tpg_state goes into TPG_STATE_INACTIVE in order to reject any +new incoming login attempts. + +Signed-off-by: Nicholas Bellinger +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/target/iscsi/iscsi_target_tpg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/target/iscsi/iscsi_target_tpg.c ++++ b/drivers/target/iscsi/iscsi_target_tpg.c +@@ -138,7 +138,7 @@ struct iscsi_portal_group *iscsit_get_tp + list_for_each_entry(tpg, &tiqn->tiqn_tpg_list, tpg_list) { + + spin_lock(&tpg->tpg_state_lock); +- if (tpg->tpg_state == TPG_STATE_FREE) { ++ if (tpg->tpg_state != TPG_STATE_ACTIVE) { + spin_unlock(&tpg->tpg_state_lock); + continue; + } diff --git a/queue-3.10/series b/queue-3.10/series index 973d09df85d..836f3a60caf 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -50,3 +50,6 @@ spi-spi-ath79-fix-initial-gpio-cs-line-setup.patch nfs-fix-a-delegation-callback-race.patch nfsv4-nfs4_stateid_is_current-should-return-true-for-an-invalid-stateid.patch acpi-sleep-add-extra-checks-for-hw-reduced-acpi-mode-sleep-states.patch +iscsi-target-fix-iscsit_get_tpg_from_np-tpg_state-bug.patch +fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch +drm-radeon-atom-select-the-proper-number-of-lanes-in.patch