From: Greg Kroah-Hartman Date: Thu, 12 Apr 2018 15:06:17 +0000 (+0200) Subject: pending patch added and dropped broken 4.14 i915 patch X-Git-Tag: v4.9.94~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2dfce4adeb6fe736fabfe73aad4bef3d2be1e543;p=thirdparty%2Fkernel%2Fstable-queue.git pending patch added and dropped broken 4.14 i915 patch --- diff --git a/pending/netfilter-ipset-missing-nfnl_lock-nfnl_unlock-is-added-to-ip_set_net_exit.patch b/pending/netfilter-ipset-missing-nfnl_lock-nfnl_unlock-is-added-to-ip_set_net_exit.patch new file mode 100644 index 00000000000..a1986d7cea4 --- /dev/null +++ b/pending/netfilter-ipset-missing-nfnl_lock-nfnl_unlock-is-added-to-ip_set_net_exit.patch @@ -0,0 +1,37 @@ +From f998b6b10144cd9809da6af02758615f789e8aa1 Mon Sep 17 00:00:00 2001 +From: Jozsef Kadlecsik +Date: Sat, 6 Jan 2018 15:24:18 +0100 +Subject: netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit() + +From: Jozsef Kadlecsik + +commit f998b6b10144cd9809da6af02758615f789e8aa1 upstream. + +Patch "netfilter: ipset: use nfnl_mutex_is_locked" is added the real +mutex locking check, which revealed the missing locking in ip_set_net_exit(). + +Signed-off-by: Jozsef Kadlecsik +Reported-by: syzbot+36b06f219f2439fe62e1@syzkaller.appspotmail.com +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman + +diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c +index e00299051e79..728bf31bb386 100644 +--- a/net/netfilter/ipset/ip_set_core.c ++++ b/net/netfilter/ipset/ip_set_core.c +@@ -2078,6 +2078,7 @@ ip_set_net_exit(struct net *net) + + inst->is_deleted = true; /* flag for ip_set_nfnl_put */ + ++ nfnl_lock(NFNL_SUBSYS_IPSET); + for (i = 0; i < inst->ip_set_max; i++) { + set = ip_set(inst, i); + if (set) { +@@ -2085,6 +2086,7 @@ ip_set_net_exit(struct net *net) + ip_set_destroy_set(set); + } + } ++ nfnl_unlock(NFNL_SUBSYS_IPSET); + kfree(rcu_dereference_protected(inst->ip_set_list, 1)); + } + diff --git a/queue-4.14/drm-i915-edp-do-not-do-link-training-fallback-or-prune-modes-on-edp.patch b/queue-4.14/drm-i915-edp-do-not-do-link-training-fallback-or-prune-modes-on-edp.patch deleted file mode 100644 index d50b5421b16..00000000000 --- a/queue-4.14/drm-i915-edp-do-not-do-link-training-fallback-or-prune-modes-on-edp.patch +++ /dev/null @@ -1,79 +0,0 @@ -From a306343bcd7df89d9d45a601929e26866e7b7a81 Mon Sep 17 00:00:00 2001 -From: Manasi Navare -Date: Thu, 12 Oct 2017 12:13:38 -0700 -Subject: drm/i915/edp: Do not do link training fallback or prune modes on EDP - -From: Manasi Navare - -commit a306343bcd7df89d9d45a601929e26866e7b7a81 upstream. - -In case of eDP because the panel has a fixed mode, the link rate -and lane count at which it is trained corresponds to the link BW -required to support the native resolution of the panel. In case of -panles with lower resolutions where fewer lanes are hooked up internally, -that number is reflected in the MAX_LANE_COUNT DPCD register of the panel. -So it is pointless to fallback to lower link rate/lane count in case -of link training failure on eDP connector since the lower link BW -will not support the native resolution of the panel and we cannot -prune the preferred mode on the eDP connector. - -In case of Link training failure on the eDP panel, something is wrong -in the HW internally and hence driver errors out with a loud -and clear DRM_ERROR message. - -v2: -* Fix the DEBUG_ERROR and add {} in else (Ville Syrjala) - -Cc: Clinton Taylor -Cc: Jim Bride -Cc: Jani Nikula -Cc: Ville Syrjala -Cc: Dave Airlie -Cc: Daniel Vetter -Signed-off-by: Manasi Navare -Reviewed-by: Ville Syrjala -Reference: https://bugs.freedesktop.org/show_bug.cgi?id=103369 -Signed-off-by: Imre Deak -Link: https://patchwork.freedesktop.org/patch/msgid/1507835618-23051-1-git-send-email-manasi.d.navare@intel.com -(cherry picked from commit c0cfb10d9e1de490e36d3b9d4228c0ea0ca30677) -Signed-off-by: Rodrigo Vivi -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/intel_dp_link_training.c | 26 +++++++++++++++++--------- - 1 file changed, 17 insertions(+), 9 deletions(-) - ---- a/drivers/gpu/drm/i915/intel_dp_link_training.c -+++ b/drivers/gpu/drm/i915/intel_dp_link_training.c -@@ -328,14 +328,22 @@ intel_dp_start_link_train(struct intel_d - return; - - failure_handling: -- DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Link Training failed at link rate = %d, lane count = %d", -- intel_connector->base.base.id, -- intel_connector->base.name, -- intel_dp->link_rate, intel_dp->lane_count); -- if (!intel_dp_get_link_train_fallback_values(intel_dp, -- intel_dp->link_rate, -- intel_dp->lane_count)) -- /* Schedule a Hotplug Uevent to userspace to start modeset */ -- schedule_work(&intel_connector->modeset_retry_work); -+ /* Dont fallback and prune modes if its eDP */ -+ if (!intel_dp_is_edp(intel_dp)) { -+ DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Link Training failed at link rate = %d, lane count = %d", -+ intel_connector->base.base.id, -+ intel_connector->base.name, -+ intel_dp->link_rate, intel_dp->lane_count); -+ if (!intel_dp_get_link_train_fallback_values(intel_dp, -+ intel_dp->link_rate, -+ intel_dp->lane_count)) -+ /* Schedule a Hotplug Uevent to userspace to start modeset */ -+ schedule_work(&intel_connector->modeset_retry_work); -+ } else { -+ DRM_ERROR("[CONNECTOR:%d:%s] Link Training failed at link rate = %d, lane count = %d", -+ intel_connector->base.base.id, -+ intel_connector->base.name, -+ intel_dp->link_rate, intel_dp->lane_count); -+ } - return; - } diff --git a/queue-4.14/series b/queue-4.14/series index b44edfb0595..6ba64e39f71 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1 +1 @@ -drm-i915-edp-do-not-do-link-training-fallback-or-prune-modes-on-edp.patch +netfilter-ipset-missing-nfnl_lock-nfnl_unlock-is-added-to-ip_set_net_exit.patch diff --git a/queue-4.15/series b/queue-4.15/series index b44edfb0595..8a6b3dcd5dd 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -1 +1,2 @@ drm-i915-edp-do-not-do-link-training-fallback-or-prune-modes-on-edp.patch +netfilter-ipset-missing-nfnl_lock-nfnl_unlock-is-added-to-ip_set_net_exit.patch