From: Greg Kroah-Hartman Date: Thu, 18 Oct 2018 09:50:46 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.18.16~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=173d5a22c7f3c8d7051ae0551113be693065683c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: batman-adv-avoid-probe-elp-information-leak.patch batman-adv-fix-backbone_gw-refcount-on-queue_work-failure.patch batman-adv-fix-hardif_neigh-refcount-on-queue_work-failure.patch batman-adv-fix-segfault-when-writing-to-sysfs-elp_interval.patch batman-adv-fix-segfault-when-writing-to-throughput_override.patch batman-adv-prevent-duplicated-gateway_node-entry.patch batman-adv-prevent-duplicated-global-tt-entry.patch batman-adv-prevent-duplicated-nc_node-entry.patch batman-adv-prevent-duplicated-softif_vlan-entry.patch batman-adv-prevent-duplicated-tvlv-handler.patch clocksource-drivers-fttmr010-fix-set_next_event-handler.patch clocksource-drivers-ti-32k-add-clock_source_suspend_nonstop-flag-for-non-am43-socs.patch drm-mali-dp-call-drm_crtc_vblank_reset-on-device-init.patch input-atakbd-fix-atari-capslock-behaviour.patch input-atakbd-fix-atari-keymap.patch intel_th-pci-add-ice-lake-pch-support.patch iommu-amd-return-devid-as-alias-for-acpi-hid-devices.patch media-af9035-prevent-buffer-overflow-on-write.patch net-emac-fix-fixed-link-setup-for-the-rtl8363sb-switch.patch net-mlx4-use-cpumask_available-for-eq-affinity_mask.patch pci-dwc-fix-scheduling-while-atomic-issues.patch powerpc-lib-feature-fixups-use-raw_patch_instruction.patch powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch powerpc-tm-fix-userspace-r13-corruption.patch ravb-do-not-write-1-to-reserved-bits.patch risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch scsi-ibmvscsis-ensure-partition-name-is-properly-nul-terminated.patch scsi-ibmvscsis-fix-a-stringop-overflow-warning.patch scsi-ipr-system-hung-while-dlpar-adding-primary-ipr-adapter-back.patch scsi-sd-don-t-crash-the-host-on-invalid-commands.patch --- diff --git a/queue-4.14/batman-adv-avoid-probe-elp-information-leak.patch b/queue-4.14/batman-adv-avoid-probe-elp-information-leak.patch new file mode 100644 index 00000000000..7496b077456 --- /dev/null +++ b/queue-4.14/batman-adv-avoid-probe-elp-information-leak.patch @@ -0,0 +1,39 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Sven Eckelmann +Date: Fri, 31 Aug 2018 15:08:44 +0200 +Subject: batman-adv: Avoid probe ELP information leak + +From: Sven Eckelmann + +[ Upstream commit 88d0895d0ea9d4431507d576c963f2ff9918144d ] + +The probe ELPs for WiFi interfaces are expanded to contain at least +BATADV_ELP_MIN_PROBE_SIZE bytes. This is usually a lot more than the +number of bytes which the template ELP packet requires. + +These extra padding bytes were not initialized and thus could contain data +which were previously stored at the same location. It is therefore required +to set it to some predefined or random values to avoid leaking private +information from the system transmitting these kind of packets. + +Fixes: e4623c913508 ("batman-adv: Avoid probe ELP information leak") +Signed-off-by: Sven Eckelmann +Acked-by: Antonio Quartulli +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/bat_v_elp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/batman-adv/bat_v_elp.c ++++ b/net/batman-adv/bat_v_elp.c +@@ -227,7 +227,7 @@ batadv_v_elp_wifi_neigh_probe(struct bat + * the packet to be exactly of that size to make the link + * throughput estimation effective. + */ +- skb_put(skb, probe_len - hard_iface->bat_v.elp_skb->len); ++ skb_put_zero(skb, probe_len - hard_iface->bat_v.elp_skb->len); + + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Sending unicast (probe) ELP packet on interface %s to %pM\n", diff --git a/queue-4.14/batman-adv-fix-backbone_gw-refcount-on-queue_work-failure.patch b/queue-4.14/batman-adv-fix-backbone_gw-refcount-on-queue_work-failure.patch new file mode 100644 index 00000000000..f07102d5f58 --- /dev/null +++ b/queue-4.14/batman-adv-fix-backbone_gw-refcount-on-queue_work-failure.patch @@ -0,0 +1,49 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Marek Lindner +Date: Fri, 7 Sep 2018 05:45:54 +0800 +Subject: batman-adv: fix backbone_gw refcount on queue_work() failure + +From: Marek Lindner + +[ Upstream commit 5af96b9c59c72fb2af2d19c5cc2f3cdcee391dff ] + +The backbone_gw refcounter is to be decreased by the queued work and +currently is never decreased if the queue_work() call fails. +Fix by checking the queue_work() return value and decrease refcount +if necessary. + +Signed-off-by: Marek Lindner +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/bridge_loop_avoidance.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +--- a/net/batman-adv/bridge_loop_avoidance.c ++++ b/net/batman-adv/bridge_loop_avoidance.c +@@ -1772,6 +1772,7 @@ batadv_bla_loopdetect_check(struct batad + { + struct batadv_bla_backbone_gw *backbone_gw; + struct ethhdr *ethhdr; ++ bool ret; + + ethhdr = eth_hdr(skb); + +@@ -1795,8 +1796,13 @@ batadv_bla_loopdetect_check(struct batad + if (unlikely(!backbone_gw)) + return true; + +- queue_work(batadv_event_workqueue, &backbone_gw->report_work); +- /* backbone_gw is unreferenced in the report work function function */ ++ ret = queue_work(batadv_event_workqueue, &backbone_gw->report_work); ++ ++ /* backbone_gw is unreferenced in the report work function function ++ * if queue_work() call was successful ++ */ ++ if (!ret) ++ batadv_backbone_gw_put(backbone_gw); + + return true; + } diff --git a/queue-4.14/batman-adv-fix-hardif_neigh-refcount-on-queue_work-failure.patch b/queue-4.14/batman-adv-fix-hardif_neigh-refcount-on-queue_work-failure.patch new file mode 100644 index 00000000000..c1a92c96948 --- /dev/null +++ b/queue-4.14/batman-adv-fix-hardif_neigh-refcount-on-queue_work-failure.patch @@ -0,0 +1,47 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Marek Lindner +Date: Fri, 7 Sep 2018 05:45:55 +0800 +Subject: batman-adv: fix hardif_neigh refcount on queue_work() failure + +From: Marek Lindner + +[ Upstream commit 4c4af6900844ab04c9434c972021d7b48610e06a ] + +The hardif_neigh refcounter is to be decreased by the queued work and +currently is never decreased if the queue_work() call fails. +Fix by checking the queue_work() return value and decrease refcount +if necessary. + +Signed-off-by: Marek Lindner +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/bat_v_elp.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/net/batman-adv/bat_v_elp.c ++++ b/net/batman-adv/bat_v_elp.c +@@ -254,6 +254,7 @@ static void batadv_v_elp_periodic_work(s + struct batadv_priv *bat_priv; + struct sk_buff *skb; + u32 elp_interval; ++ bool ret; + + bat_v = container_of(work, struct batadv_hard_iface_bat_v, elp_wq.work); + hard_iface = container_of(bat_v, struct batadv_hard_iface, bat_v); +@@ -315,8 +316,11 @@ static void batadv_v_elp_periodic_work(s + * may sleep and that is not allowed in an rcu protected + * context. Therefore schedule a task for that. + */ +- queue_work(batadv_event_workqueue, +- &hardif_neigh->bat_v.metric_work); ++ ret = queue_work(batadv_event_workqueue, ++ &hardif_neigh->bat_v.metric_work); ++ ++ if (!ret) ++ batadv_hardif_neigh_put(hardif_neigh); + } + rcu_read_unlock(); + diff --git a/queue-4.14/batman-adv-fix-segfault-when-writing-to-sysfs-elp_interval.patch b/queue-4.14/batman-adv-fix-segfault-when-writing-to-sysfs-elp_interval.patch new file mode 100644 index 00000000000..25b938a2da4 --- /dev/null +++ b/queue-4.14/batman-adv-fix-segfault-when-writing-to-sysfs-elp_interval.patch @@ -0,0 +1,112 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Sven Eckelmann +Date: Fri, 31 Aug 2018 16:56:29 +0200 +Subject: batman-adv: Fix segfault when writing to sysfs elp_interval + +From: Sven Eckelmann + +[ Upstream commit a25bab9d723a08bd0bdafb1529faf9094c690b70 ] + +The per hardif sysfs file "batman_adv/elp_interval" is using the generic +functions to store/show uint values. The helper __batadv_store_uint_attr +requires the softif net_device as parameter to print the resulting change +as info text when the users writes to this file. It uses the helper +function batadv_info to add it at the same time to the kernel ring buffer +and to the batman-adv debug log (when CONFIG_BATMAN_ADV_DEBUG is enabled). + +The function batadv_info requires as first parameter the batman-adv softif +net_device. This parameter is then used to find the private buffer which +contains the debug log for this batman-adv interface. But +batadv_store_throughput_override used as first argument the slave +net_device. This slave device doesn't have the batadv_priv private data +which is access by batadv_info. + +Writing to this file with CONFIG_BATMAN_ADV_DEBUG enabled can either lead +to a segfault or to memory corruption. + +Fixes: 0744ff8fa8fa ("batman-adv: Add hard_iface specific sysfs wrapper macros for UINT") +Signed-off-by: Sven Eckelmann +Acked-by: Marek Lindner +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/sysfs.c | 25 +++++++++++++++++-------- + 1 file changed, 17 insertions(+), 8 deletions(-) + +--- a/net/batman-adv/sysfs.c ++++ b/net/batman-adv/sysfs.c +@@ -186,7 +186,8 @@ ssize_t batadv_store_##_name(struct kobj + \ + return __batadv_store_uint_attr(buff, count, _min, _max, \ + _post_func, attr, \ +- &bat_priv->_var, net_dev); \ ++ &bat_priv->_var, net_dev, \ ++ NULL); \ + } + + #define BATADV_ATTR_SIF_SHOW_UINT(_name, _var) \ +@@ -260,7 +261,9 @@ ssize_t batadv_store_##_name(struct kobj + \ + length = __batadv_store_uint_attr(buff, count, _min, _max, \ + _post_func, attr, \ +- &hard_iface->_var, net_dev); \ ++ &hard_iface->_var, \ ++ hard_iface->soft_iface, \ ++ net_dev); \ + \ + batadv_hardif_put(hard_iface); \ + return length; \ +@@ -354,10 +357,12 @@ __batadv_store_bool_attr(char *buff, siz + + static int batadv_store_uint_attr(const char *buff, size_t count, + struct net_device *net_dev, ++ struct net_device *slave_dev, + const char *attr_name, + unsigned int min, unsigned int max, + atomic_t *attr) + { ++ char ifname[IFNAMSIZ + 3] = ""; + unsigned long uint_val; + int ret; + +@@ -383,8 +388,11 @@ static int batadv_store_uint_attr(const + if (atomic_read(attr) == uint_val) + return count; + +- batadv_info(net_dev, "%s: Changing from: %i to: %lu\n", +- attr_name, atomic_read(attr), uint_val); ++ if (slave_dev) ++ snprintf(ifname, sizeof(ifname), "%s: ", slave_dev->name); ++ ++ batadv_info(net_dev, "%s: %sChanging from: %i to: %lu\n", ++ attr_name, ifname, atomic_read(attr), uint_val); + + atomic_set(attr, uint_val); + return count; +@@ -395,12 +403,13 @@ static ssize_t __batadv_store_uint_attr( + void (*post_func)(struct net_device *), + const struct attribute *attr, + atomic_t *attr_store, +- struct net_device *net_dev) ++ struct net_device *net_dev, ++ struct net_device *slave_dev) + { + int ret; + +- ret = batadv_store_uint_attr(buff, count, net_dev, attr->name, min, max, +- attr_store); ++ ret = batadv_store_uint_attr(buff, count, net_dev, slave_dev, ++ attr->name, min, max, attr_store); + if (post_func && ret) + post_func(net_dev); + +@@ -569,7 +578,7 @@ static ssize_t batadv_store_gw_sel_class + return __batadv_store_uint_attr(buff, count, 1, BATADV_TQ_MAX_VALUE, + batadv_post_gw_reselect, attr, + &bat_priv->gw.sel_class, +- bat_priv->soft_iface); ++ bat_priv->soft_iface, NULL); + } + + static ssize_t batadv_show_gw_bwidth(struct kobject *kobj, diff --git a/queue-4.14/batman-adv-fix-segfault-when-writing-to-throughput_override.patch b/queue-4.14/batman-adv-fix-segfault-when-writing-to-throughput_override.patch new file mode 100644 index 00000000000..0915aa97e2c --- /dev/null +++ b/queue-4.14/batman-adv-fix-segfault-when-writing-to-throughput_override.patch @@ -0,0 +1,49 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Sven Eckelmann +Date: Fri, 31 Aug 2018 16:46:47 +0200 +Subject: batman-adv: Fix segfault when writing to throughput_override + +From: Sven Eckelmann + +[ Upstream commit b9fd14c20871e6189f635e49b32d7789e430b3c8 ] + +The per hardif sysfs file "batman_adv/throughput_override" prints the +resulting change as info text when the users writes to this file. It uses +the helper function batadv_info to add it at the same time to the kernel +ring buffer and to the batman-adv debug log (when CONFIG_BATMAN_ADV_DEBUG +is enabled). + +The function batadv_info requires as first parameter the batman-adv softif +net_device. This parameter is then used to find the private buffer which +contains the debug log for this batman-adv interface. But +batadv_store_throughput_override used as first argument the slave +net_device. This slave device doesn't have the batadv_priv private data +which is access by batadv_info. + +Writing to this file with CONFIG_BATMAN_ADV_DEBUG enabled can either lead +to a segfault or to memory corruption. + +Fixes: 0b5ecc6811bd ("batman-adv: add throughput override attribute to hard_ifaces") +Signed-off-by: Sven Eckelmann +Acked-by: Marek Lindner +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/sysfs.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/net/batman-adv/sysfs.c ++++ b/net/batman-adv/sysfs.c +@@ -1078,8 +1078,9 @@ static ssize_t batadv_store_throughput_o + if (old_tp_override == tp_override) + goto out; + +- batadv_info(net_dev, "%s: Changing from: %u.%u MBit to: %u.%u MBit\n", +- "throughput_override", ++ batadv_info(hard_iface->soft_iface, ++ "%s: %s: Changing from: %u.%u MBit to: %u.%u MBit\n", ++ "throughput_override", net_dev->name, + old_tp_override / 10, old_tp_override % 10, + tp_override / 10, tp_override % 10); + diff --git a/queue-4.14/batman-adv-prevent-duplicated-gateway_node-entry.patch b/queue-4.14/batman-adv-prevent-duplicated-gateway_node-entry.patch new file mode 100644 index 00000000000..5e28c0be93d --- /dev/null +++ b/queue-4.14/batman-adv-prevent-duplicated-gateway_node-entry.patch @@ -0,0 +1,85 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Sven Eckelmann +Date: Sun, 12 Aug 2018 21:04:41 +0200 +Subject: batman-adv: Prevent duplicated gateway_node entry + +From: Sven Eckelmann + +[ Upstream commit dff9bc42ab0b2d38c5e90ddd79b238fed5b4c7ad ] + +The function batadv_gw_node_add is responsible for adding new gw_node to +the gateway_list. It is expecting that the caller already checked that +there is not already an entry with the same key or not. + +But the lock for the list is only held when the list is really modified. +This could lead to duplicated entries because another context could create +an entry with the same key between the check and the list manipulation. + +The check and the manipulation of the list must therefore be in the same +locked code section. + +Fixes: c6c8fea29769 ("net: Add batman-adv meshing protocol") +Signed-off-by: Sven Eckelmann +Acked-by: Marek Lindner +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/gateway_client.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/net/batman-adv/gateway_client.c ++++ b/net/batman-adv/gateway_client.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -325,6 +326,9 @@ out: + * @bat_priv: the bat priv with all the soft interface information + * @orig_node: originator announcing gateway capabilities + * @gateway: announced bandwidth information ++ * ++ * Has to be called with the appropriate locks being acquired ++ * (gw.list_lock). + */ + static void batadv_gw_node_add(struct batadv_priv *bat_priv, + struct batadv_orig_node *orig_node, +@@ -332,6 +336,8 @@ static void batadv_gw_node_add(struct ba + { + struct batadv_gw_node *gw_node; + ++ lockdep_assert_held(&bat_priv->gw.list_lock); ++ + if (gateway->bandwidth_down == 0) + return; + +@@ -346,10 +352,8 @@ static void batadv_gw_node_add(struct ba + gw_node->bandwidth_down = ntohl(gateway->bandwidth_down); + gw_node->bandwidth_up = ntohl(gateway->bandwidth_up); + +- spin_lock_bh(&bat_priv->gw.list_lock); + kref_get(&gw_node->refcount); + hlist_add_head_rcu(&gw_node->list, &bat_priv->gw.gateway_list); +- spin_unlock_bh(&bat_priv->gw.list_lock); + + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Found new gateway %pM -> gw bandwidth: %u.%u/%u.%u MBit\n", +@@ -405,11 +409,14 @@ void batadv_gw_node_update(struct batadv + { + struct batadv_gw_node *gw_node, *curr_gw = NULL; + ++ spin_lock_bh(&bat_priv->gw.list_lock); + gw_node = batadv_gw_node_get(bat_priv, orig_node); + if (!gw_node) { + batadv_gw_node_add(bat_priv, orig_node, gateway); ++ spin_unlock_bh(&bat_priv->gw.list_lock); + goto out; + } ++ spin_unlock_bh(&bat_priv->gw.list_lock); + + if ((gw_node->bandwidth_down == ntohl(gateway->bandwidth_down)) && + (gw_node->bandwidth_up == ntohl(gateway->bandwidth_up))) diff --git a/queue-4.14/batman-adv-prevent-duplicated-global-tt-entry.patch b/queue-4.14/batman-adv-prevent-duplicated-global-tt-entry.patch new file mode 100644 index 00000000000..e0b0f9ccd68 --- /dev/null +++ b/queue-4.14/batman-adv-prevent-duplicated-global-tt-entry.patch @@ -0,0 +1,62 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Sven Eckelmann +Date: Sun, 12 Aug 2018 21:04:44 +0200 +Subject: batman-adv: Prevent duplicated global TT entry + +From: Sven Eckelmann + +[ Upstream commit e7136e48ffdfb9f37b0820f619380485eb407361 ] + +The function batadv_tt_global_orig_entry_add is responsible for adding new +tt_orig_list_entry to the orig_list. It first checks whether the entry +already is in the list or not. If it is, then the creation of a new entry +is aborted. + +But the lock for the list is only held when the list is really modified. +This could lead to duplicated entries because another context could create +an entry with the same key between the check and the list manipulation. + +The check and the manipulation of the list must therefore be in the same +locked code section. + +Fixes: d657e621a0f5 ("batman-adv: add reference counting for type batadv_tt_orig_list_entry") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/translation-table.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/net/batman-adv/translation-table.c ++++ b/net/batman-adv/translation-table.c +@@ -1587,6 +1587,8 @@ batadv_tt_global_orig_entry_add(struct b + { + struct batadv_tt_orig_list_entry *orig_entry; + ++ spin_lock_bh(&tt_global->list_lock); ++ + orig_entry = batadv_tt_global_orig_entry_find(tt_global, orig_node); + if (orig_entry) { + /* refresh the ttvn: the current value could be a bogus one that +@@ -1609,11 +1611,9 @@ batadv_tt_global_orig_entry_add(struct b + orig_entry->flags = flags; + kref_init(&orig_entry->refcount); + +- spin_lock_bh(&tt_global->list_lock); + kref_get(&orig_entry->refcount); + hlist_add_head_rcu(&orig_entry->list, + &tt_global->orig_list); +- spin_unlock_bh(&tt_global->list_lock); + atomic_inc(&tt_global->orig_list_count); + + sync_flags: +@@ -1621,6 +1621,8 @@ sync_flags: + out: + if (orig_entry) + batadv_tt_orig_list_entry_put(orig_entry); ++ ++ spin_unlock_bh(&tt_global->list_lock); + } + + /** diff --git a/queue-4.14/batman-adv-prevent-duplicated-nc_node-entry.patch b/queue-4.14/batman-adv-prevent-duplicated-nc_node-entry.patch new file mode 100644 index 00000000000..5efbadc35d8 --- /dev/null +++ b/queue-4.14/batman-adv-prevent-duplicated-nc_node-entry.patch @@ -0,0 +1,88 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Sven Eckelmann +Date: Sun, 12 Aug 2018 21:04:42 +0200 +Subject: batman-adv: Prevent duplicated nc_node entry + +From: Sven Eckelmann + +[ Upstream commit fa122fec8640eb7186ce5a41b83a4c1744ceef8f ] + +The function batadv_nc_get_nc_node is responsible for adding new nc_nodes +to the in_coding_list and out_coding_list. It first checks whether the +entry already is in the list or not. If it is, then the creation of a new +entry is aborted. + +But the lock for the list is only held when the list is really modified. +This could lead to duplicated entries because another context could create +an entry with the same key between the check and the list manipulation. + +The check and the manipulation of the list must therefore be in the same +locked code section. + +Fixes: d56b1705e28c ("batman-adv: network coding - detect coding nodes and remove these after timeout") +Signed-off-by: Sven Eckelmann +Acked-by: Marek Lindner +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/network-coding.c | 27 +++++++++++++++------------ + 1 file changed, 15 insertions(+), 12 deletions(-) + +--- a/net/batman-adv/network-coding.c ++++ b/net/batman-adv/network-coding.c +@@ -850,16 +850,27 @@ batadv_nc_get_nc_node(struct batadv_priv + spinlock_t *lock; /* Used to lock list selected by "int in_coding" */ + struct list_head *list; + ++ /* Select ingoing or outgoing coding node */ ++ if (in_coding) { ++ lock = &orig_neigh_node->in_coding_list_lock; ++ list = &orig_neigh_node->in_coding_list; ++ } else { ++ lock = &orig_neigh_node->out_coding_list_lock; ++ list = &orig_neigh_node->out_coding_list; ++ } ++ ++ spin_lock_bh(lock); ++ + /* Check if nc_node is already added */ + nc_node = batadv_nc_find_nc_node(orig_node, orig_neigh_node, in_coding); + + /* Node found */ + if (nc_node) +- return nc_node; ++ goto unlock; + + nc_node = kzalloc(sizeof(*nc_node), GFP_ATOMIC); + if (!nc_node) +- return NULL; ++ goto unlock; + + /* Initialize nc_node */ + INIT_LIST_HEAD(&nc_node->list); +@@ -868,22 +879,14 @@ batadv_nc_get_nc_node(struct batadv_priv + kref_get(&orig_neigh_node->refcount); + nc_node->orig_node = orig_neigh_node; + +- /* Select ingoing or outgoing coding node */ +- if (in_coding) { +- lock = &orig_neigh_node->in_coding_list_lock; +- list = &orig_neigh_node->in_coding_list; +- } else { +- lock = &orig_neigh_node->out_coding_list_lock; +- list = &orig_neigh_node->out_coding_list; +- } +- + batadv_dbg(BATADV_DBG_NC, bat_priv, "Adding nc_node %pM -> %pM\n", + nc_node->addr, nc_node->orig_node->orig); + + /* Add nc_node to orig_node */ +- spin_lock_bh(lock); + kref_get(&nc_node->refcount); + list_add_tail_rcu(&nc_node->list, list); ++ ++unlock: + spin_unlock_bh(lock); + + return nc_node; diff --git a/queue-4.14/batman-adv-prevent-duplicated-softif_vlan-entry.patch b/queue-4.14/batman-adv-prevent-duplicated-softif_vlan-entry.patch new file mode 100644 index 00000000000..770da08c786 --- /dev/null +++ b/queue-4.14/batman-adv-prevent-duplicated-softif_vlan-entry.patch @@ -0,0 +1,84 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Sven Eckelmann +Date: Sun, 12 Aug 2018 21:04:43 +0200 +Subject: batman-adv: Prevent duplicated softif_vlan entry + +From: Sven Eckelmann + +[ Upstream commit 94cb82f594ed86be303398d6dfc7640a6f1d45d4 ] + +The function batadv_softif_vlan_get is responsible for adding new +softif_vlan to the softif_vlan_list. It first checks whether the entry +already is in the list or not. If it is, then the creation of a new entry +is aborted. + +But the lock for the list is only held when the list is really modified. +This could lead to duplicated entries because another context could create +an entry with the same key between the check and the list manipulation. + +The check and the manipulation of the list must therefore be in the same +locked code section. + +Fixes: 5d2c05b21337 ("batman-adv: add per VLAN interface attribute framework") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/soft-interface.c | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) + +--- a/net/batman-adv/soft-interface.c ++++ b/net/batman-adv/soft-interface.c +@@ -566,15 +566,20 @@ int batadv_softif_create_vlan(struct bat + struct batadv_softif_vlan *vlan; + int err; + ++ spin_lock_bh(&bat_priv->softif_vlan_list_lock); ++ + vlan = batadv_softif_vlan_get(bat_priv, vid); + if (vlan) { + batadv_softif_vlan_put(vlan); ++ spin_unlock_bh(&bat_priv->softif_vlan_list_lock); + return -EEXIST; + } + + vlan = kzalloc(sizeof(*vlan), GFP_ATOMIC); +- if (!vlan) ++ if (!vlan) { ++ spin_unlock_bh(&bat_priv->softif_vlan_list_lock); + return -ENOMEM; ++ } + + vlan->bat_priv = bat_priv; + vlan->vid = vid; +@@ -582,17 +587,23 @@ int batadv_softif_create_vlan(struct bat + + atomic_set(&vlan->ap_isolation, 0); + ++ kref_get(&vlan->refcount); ++ hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); ++ spin_unlock_bh(&bat_priv->softif_vlan_list_lock); ++ ++ /* batadv_sysfs_add_vlan cannot be in the spinlock section due to the ++ * sleeping behavior of the sysfs functions and the fs_reclaim lock ++ */ + err = batadv_sysfs_add_vlan(bat_priv->soft_iface, vlan); + if (err) { +- kfree(vlan); ++ /* ref for the function */ ++ batadv_softif_vlan_put(vlan); ++ ++ /* ref for the list */ ++ batadv_softif_vlan_put(vlan); + return err; + } + +- spin_lock_bh(&bat_priv->softif_vlan_list_lock); +- kref_get(&vlan->refcount); +- hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); +- spin_unlock_bh(&bat_priv->softif_vlan_list_lock); +- + /* add a new TT local entry. This one will be marked with the NOPURGE + * flag + */ diff --git a/queue-4.14/batman-adv-prevent-duplicated-tvlv-handler.patch b/queue-4.14/batman-adv-prevent-duplicated-tvlv-handler.patch new file mode 100644 index 00000000000..d9db0f82653 --- /dev/null +++ b/queue-4.14/batman-adv-prevent-duplicated-tvlv-handler.patch @@ -0,0 +1,62 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Sven Eckelmann +Date: Sun, 12 Aug 2018 21:04:45 +0200 +Subject: batman-adv: Prevent duplicated tvlv handler + +From: Sven Eckelmann + +[ Upstream commit ae3cdc97dc10c7a3b31f297dab429bfb774c9ccb ] + +The function batadv_tvlv_handler_register is responsible for adding new +tvlv_handler to the handler_list. It first checks whether the entry +already is in the list or not. If it is, then the creation of a new entry +is aborted. + +But the lock for the list is only held when the list is really modified. +This could lead to duplicated entries because another context could create +an entry with the same key between the check and the list manipulation. + +The check and the manipulation of the list must therefore be in the same +locked code section. + +Fixes: ef26157747d4 ("batman-adv: tvlv - basic infrastructure") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/tvlv.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/net/batman-adv/tvlv.c ++++ b/net/batman-adv/tvlv.c +@@ -528,15 +528,20 @@ void batadv_tvlv_handler_register(struct + { + struct batadv_tvlv_handler *tvlv_handler; + ++ spin_lock_bh(&bat_priv->tvlv.handler_list_lock); ++ + tvlv_handler = batadv_tvlv_handler_get(bat_priv, type, version); + if (tvlv_handler) { ++ spin_unlock_bh(&bat_priv->tvlv.handler_list_lock); + batadv_tvlv_handler_put(tvlv_handler); + return; + } + + tvlv_handler = kzalloc(sizeof(*tvlv_handler), GFP_ATOMIC); +- if (!tvlv_handler) ++ if (!tvlv_handler) { ++ spin_unlock_bh(&bat_priv->tvlv.handler_list_lock); + return; ++ } + + tvlv_handler->ogm_handler = optr; + tvlv_handler->unicast_handler = uptr; +@@ -546,7 +551,6 @@ void batadv_tvlv_handler_register(struct + kref_init(&tvlv_handler->refcount); + INIT_HLIST_NODE(&tvlv_handler->list); + +- spin_lock_bh(&bat_priv->tvlv.handler_list_lock); + kref_get(&tvlv_handler->refcount); + hlist_add_head_rcu(&tvlv_handler->list, &bat_priv->tvlv.handler_list); + spin_unlock_bh(&bat_priv->tvlv.handler_list_lock); diff --git a/queue-4.14/clocksource-drivers-fttmr010-fix-set_next_event-handler.patch b/queue-4.14/clocksource-drivers-fttmr010-fix-set_next_event-handler.patch new file mode 100644 index 00000000000..7fc5e0f164a --- /dev/null +++ b/queue-4.14/clocksource-drivers-fttmr010-fix-set_next_event-handler.patch @@ -0,0 +1,65 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Tao Ren +Date: Wed, 19 Sep 2018 15:13:31 -0700 +Subject: clocksource/drivers/fttmr010: Fix set_next_event handler + +From: Tao Ren + +[ Upstream commit 4451d3f59f2a6f95e5d205c2d04ea072955d080d ] + +Currently, the aspeed MATCH1 register is updated to in set_next_event handler, with the assumption that COUNT +register value is preserved when the timer is disabled and it continues +decrementing after the timer is enabled. But the assumption is wrong: +RELOAD register is loaded into COUNT register when the aspeed timer is +enabled, which means the next event may be delayed because timer +interrupt won't be generated until <0xFFFFFFFF - current_count + +cycles>. + +The problem can be fixed by updating RELOAD register to , and +COUNT register will be re-loaded when the timer is enabled and interrupt +is generated when COUNT register overflows. + +The test result on Facebook Backpack-CMM BMC hardware (AST2500) shows +the issue is fixed: without the patch, usleep(100) suspends the process +for several milliseconds (and sometimes even over 40 milliseconds); +after applying the fix, usleep(100) takes averagely 240 microseconds to +return under the same workload level. + +Signed-off-by: Tao Ren +Reviewed-by: Linus Walleij +Tested-by: Lei YU +Signed-off-by: Daniel Lezcano +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/clocksource/timer-fttmr010.c | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +--- a/drivers/clocksource/timer-fttmr010.c ++++ b/drivers/clocksource/timer-fttmr010.c +@@ -130,13 +130,17 @@ static int fttmr010_timer_set_next_event + cr &= ~fttmr010->t1_enable_val; + writel(cr, fttmr010->base + TIMER_CR); + +- /* Setup the match register forward/backward in time */ +- cr = readl(fttmr010->base + TIMER1_COUNT); +- if (fttmr010->count_down) +- cr -= cycles; +- else +- cr += cycles; +- writel(cr, fttmr010->base + TIMER1_MATCH1); ++ if (fttmr010->count_down) { ++ /* ++ * ASPEED Timer Controller will load TIMER1_LOAD register ++ * into TIMER1_COUNT register when the timer is re-enabled. ++ */ ++ writel(cycles, fttmr010->base + TIMER1_LOAD); ++ } else { ++ /* Setup the match register forward in time */ ++ cr = readl(fttmr010->base + TIMER1_COUNT); ++ writel(cr + cycles, fttmr010->base + TIMER1_MATCH1); ++ } + + /* Start */ + cr = readl(fttmr010->base + TIMER_CR); diff --git a/queue-4.14/clocksource-drivers-ti-32k-add-clock_source_suspend_nonstop-flag-for-non-am43-socs.patch b/queue-4.14/clocksource-drivers-ti-32k-add-clock_source_suspend_nonstop-flag-for-non-am43-socs.patch new file mode 100644 index 00000000000..8362e706e23 --- /dev/null +++ b/queue-4.14/clocksource-drivers-ti-32k-add-clock_source_suspend_nonstop-flag-for-non-am43-socs.patch @@ -0,0 +1,34 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Keerthy +Date: Wed, 8 Aug 2018 18:44:59 +0530 +Subject: clocksource/drivers/ti-32k: Add CLOCK_SOURCE_SUSPEND_NONSTOP flag for non-am43 SoCs + +From: Keerthy + +[ Upstream commit 3b7d96a0dbb6b630878597a1838fc39f808b761b ] + +The 32k clocksource is NONSTOP for non-am43 SoCs. Hence +add the flag for all the other SoCs. + +Reported-by: Tony Lindgren +Signed-off-by: Keerthy +Acked-by: Tony Lindgren +Signed-off-by: Daniel Lezcano +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/clocksource/timer-ti-32k.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/clocksource/timer-ti-32k.c ++++ b/drivers/clocksource/timer-ti-32k.c +@@ -98,6 +98,9 @@ static int __init ti_32k_timer_init(stru + return -ENXIO; + } + ++ if (!of_machine_is_compatible("ti,am43")) ++ ti_32k_timer.cs.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP; ++ + ti_32k_timer.counter = ti_32k_timer.base; + + /* diff --git a/queue-4.14/drm-mali-dp-call-drm_crtc_vblank_reset-on-device-init.patch b/queue-4.14/drm-mali-dp-call-drm_crtc_vblank_reset-on-device-init.patch new file mode 100644 index 00000000000..1c0acebaa74 --- /dev/null +++ b/queue-4.14/drm-mali-dp-call-drm_crtc_vblank_reset-on-device-init.patch @@ -0,0 +1,36 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Alexandru Gheorghe +Date: Mon, 16 Jul 2018 11:07:07 +0100 +Subject: drm: mali-dp: Call drm_crtc_vblank_reset on device init + +From: Alexandru Gheorghe + +[ Upstream commit 69be1984ded00a11b1ed0888c6d8e4f35370372f ] + +Currently, if userspace calls drm_wait_vblank before the crtc is +activated the crtc vblank_enable hook is called, which in case of +malidp driver triggers some warninngs. This happens because on +device init we don't inform the drm core about the vblank state +by calling drm_crtc_vblank_on/off/reset which together with +drm_vblank_get have some magic that prevents calling drm_vblank_enable +when crtc is off. + +Signed-off-by: Alexandru Gheorghe +Acked-by: Liviu Dudau +Signed-off-by: Liviu Dudau +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/arm/malidp_drv.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/gpu/drm/arm/malidp_drv.c ++++ b/drivers/gpu/drm/arm/malidp_drv.c +@@ -617,6 +617,7 @@ static int malidp_bind(struct device *de + drm->irq_enabled = true; + + ret = drm_vblank_init(drm, drm->mode_config.num_crtc); ++ drm_crtc_vblank_reset(&malidp->crtc); + if (ret < 0) { + DRM_ERROR("failed to initialise vblank\n"); + goto vblank_fail; diff --git a/queue-4.14/input-atakbd-fix-atari-capslock-behaviour.patch b/queue-4.14/input-atakbd-fix-atari-capslock-behaviour.patch new file mode 100644 index 00000000000..ac779c8ae66 --- /dev/null +++ b/queue-4.14/input-atakbd-fix-atari-capslock-behaviour.patch @@ -0,0 +1,44 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Michael Schmitz +Date: Mon, 17 Sep 2018 15:27:49 -0700 +Subject: Input: atakbd - fix Atari CapsLock behaviour + +From: Michael Schmitz + +[ Upstream commit 52d2c7bf7c90217fbe875d2d76f310979c48eb83 ] + +The CapsLock key on Atari keyboards is not a toggle, it does send the +normal make and break scancodes. + +Drop the CapsLock toggle handling code, which did cause the CapsLock +key to merely act as a Shift key. + +Tested-by: Michael Schmitz +Signed-off-by: Michael Schmitz +Signed-off-by: Andreas Schwab +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/keyboard/atakbd.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +--- a/drivers/input/keyboard/atakbd.c ++++ b/drivers/input/keyboard/atakbd.c +@@ -189,14 +189,8 @@ static void atakbd_interrupt(unsigned ch + + scancode = atakbd_keycode[scancode]; + +- if (scancode == KEY_CAPSLOCK) { /* CapsLock is a toggle switch key on Amiga */ +- input_report_key(atakbd_dev, scancode, 1); +- input_report_key(atakbd_dev, scancode, 0); +- input_sync(atakbd_dev); +- } else { +- input_report_key(atakbd_dev, scancode, down); +- input_sync(atakbd_dev); +- } ++ input_report_key(atakbd_dev, scancode, down); ++ input_sync(atakbd_dev); + } else /* scancodes >= 0xf3 are mouse data, most likely */ + printk(KERN_INFO "atakbd: unhandled scancode %x\n", scancode); + diff --git a/queue-4.14/input-atakbd-fix-atari-keymap.patch b/queue-4.14/input-atakbd-fix-atari-keymap.patch new file mode 100644 index 00000000000..29c412505a4 --- /dev/null +++ b/queue-4.14/input-atakbd-fix-atari-keymap.patch @@ -0,0 +1,133 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Andreas Schwab +Date: Mon, 17 Sep 2018 12:43:34 -0700 +Subject: Input: atakbd - fix Atari keymap + +From: Andreas Schwab + +[ Upstream commit 9e62df51be993035c577371ffee5477697a56aad ] + +Fix errors in Atari keymap (mostly in keypad, help and undo keys). + +Patch provided on debian-68k ML by Andreas Schwab , +keymap array size and unhandled scancode limit adjusted to 0x73 by me. + +Tested-by: Michael Schmitz +Signed-off-by: Michael Schmitz +Signed-off-by: Andreas Schwab +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/keyboard/atakbd.c | 64 ++++++++++++++++------------------------ + 1 file changed, 26 insertions(+), 38 deletions(-) + +--- a/drivers/input/keyboard/atakbd.c ++++ b/drivers/input/keyboard/atakbd.c +@@ -79,8 +79,7 @@ MODULE_LICENSE("GPL"); + */ + + +-static unsigned char atakbd_keycode[0x72] = { /* American layout */ +- [0] = KEY_GRAVE, ++static unsigned char atakbd_keycode[0x73] = { /* American layout */ + [1] = KEY_ESC, + [2] = KEY_1, + [3] = KEY_2, +@@ -121,9 +120,9 @@ static unsigned char atakbd_keycode[0x72 + [38] = KEY_L, + [39] = KEY_SEMICOLON, + [40] = KEY_APOSTROPHE, +- [41] = KEY_BACKSLASH, /* FIXME, '#' */ ++ [41] = KEY_GRAVE, + [42] = KEY_LEFTSHIFT, +- [43] = KEY_GRAVE, /* FIXME: '~' */ ++ [43] = KEY_BACKSLASH, + [44] = KEY_Z, + [45] = KEY_X, + [46] = KEY_C, +@@ -149,45 +148,34 @@ static unsigned char atakbd_keycode[0x72 + [66] = KEY_F8, + [67] = KEY_F9, + [68] = KEY_F10, +- [69] = KEY_ESC, +- [70] = KEY_DELETE, +- [71] = KEY_KP7, +- [72] = KEY_KP8, +- [73] = KEY_KP9, ++ [71] = KEY_HOME, ++ [72] = KEY_UP, + [74] = KEY_KPMINUS, +- [75] = KEY_KP4, +- [76] = KEY_KP5, +- [77] = KEY_KP6, ++ [75] = KEY_LEFT, ++ [77] = KEY_RIGHT, + [78] = KEY_KPPLUS, +- [79] = KEY_KP1, +- [80] = KEY_KP2, +- [81] = KEY_KP3, +- [82] = KEY_KP0, +- [83] = KEY_KPDOT, +- [90] = KEY_KPLEFTPAREN, +- [91] = KEY_KPRIGHTPAREN, +- [92] = KEY_KPASTERISK, /* FIXME */ +- [93] = KEY_KPASTERISK, +- [94] = KEY_KPPLUS, +- [95] = KEY_HELP, ++ [80] = KEY_DOWN, ++ [82] = KEY_INSERT, ++ [83] = KEY_DELETE, + [96] = KEY_102ND, +- [97] = KEY_KPASTERISK, /* FIXME */ +- [98] = KEY_KPSLASH, ++ [97] = KEY_UNDO, ++ [98] = KEY_HELP, + [99] = KEY_KPLEFTPAREN, + [100] = KEY_KPRIGHTPAREN, + [101] = KEY_KPSLASH, + [102] = KEY_KPASTERISK, +- [103] = KEY_UP, +- [104] = KEY_KPASTERISK, /* FIXME */ +- [105] = KEY_LEFT, +- [106] = KEY_RIGHT, +- [107] = KEY_KPASTERISK, /* FIXME */ +- [108] = KEY_DOWN, +- [109] = KEY_KPASTERISK, /* FIXME */ +- [110] = KEY_KPASTERISK, /* FIXME */ +- [111] = KEY_KPASTERISK, /* FIXME */ +- [112] = KEY_KPASTERISK, /* FIXME */ +- [113] = KEY_KPASTERISK /* FIXME */ ++ [103] = KEY_KP7, ++ [104] = KEY_KP8, ++ [105] = KEY_KP9, ++ [106] = KEY_KP4, ++ [107] = KEY_KP5, ++ [108] = KEY_KP6, ++ [109] = KEY_KP1, ++ [110] = KEY_KP2, ++ [111] = KEY_KP3, ++ [112] = KEY_KP0, ++ [113] = KEY_KPDOT, ++ [114] = KEY_KPENTER, + }; + + static struct input_dev *atakbd_dev; +@@ -195,7 +183,7 @@ static struct input_dev *atakbd_dev; + static void atakbd_interrupt(unsigned char scancode, char down) + { + +- if (scancode < 0x72) { /* scancodes < 0xf2 are keys */ ++ if (scancode < 0x73) { /* scancodes < 0xf3 are keys */ + + // report raw events here? + +@@ -209,7 +197,7 @@ static void atakbd_interrupt(unsigned ch + input_report_key(atakbd_dev, scancode, down); + input_sync(atakbd_dev); + } +- } else /* scancodes >= 0xf2 are mouse data, most likely */ ++ } else /* scancodes >= 0xf3 are mouse data, most likely */ + printk(KERN_INFO "atakbd: unhandled scancode %x\n", scancode); + + return; diff --git a/queue-4.14/intel_th-pci-add-ice-lake-pch-support.patch b/queue-4.14/intel_th-pci-add-ice-lake-pch-support.patch new file mode 100644 index 00000000000..2166431710a --- /dev/null +++ b/queue-4.14/intel_th-pci-add-ice-lake-pch-support.patch @@ -0,0 +1,33 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Alexander Shishkin +Date: Tue, 18 Sep 2018 16:10:49 +0300 +Subject: intel_th: pci: Add Ice Lake PCH support + +From: Alexander Shishkin + +[ Upstream commit 59d08d00d43c644ee2011d7ff1807bdd69f31fe0 ] + +This adds Intel(R) Trace Hub PCI ID for Ice Lake PCH. + +Signed-off-by: Alexander Shishkin +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hwtracing/intel_th/pci.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/hwtracing/intel_th/pci.c ++++ b/drivers/hwtracing/intel_th/pci.c +@@ -168,6 +168,11 @@ static const struct pci_device_id intel_ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x18e1), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, ++ { ++ /* Ice Lake PCH */ ++ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x34a6), ++ .driver_data = (kernel_ulong_t)&intel_th_2x, ++ }, + { 0 }, + }; + diff --git a/queue-4.14/iommu-amd-return-devid-as-alias-for-acpi-hid-devices.patch b/queue-4.14/iommu-amd-return-devid-as-alias-for-acpi-hid-devices.patch new file mode 100644 index 00000000000..85af88a640c --- /dev/null +++ b/queue-4.14/iommu-amd-return-devid-as-alias-for-acpi-hid-devices.patch @@ -0,0 +1,41 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Arindam Nath +Date: Tue, 18 Sep 2018 15:40:58 +0530 +Subject: iommu/amd: Return devid as alias for ACPI HID devices + +From: Arindam Nath + +[ Upstream commit 5ebb1bc2d63d90dd204169e21fd7a0b4bb8c776e ] + +ACPI HID devices do not actually have an alias for +them in the IVRS. But dev_data->alias is still used +for indexing into the IOMMU device table for devices +being handled by the IOMMU. So for ACPI HID devices, +we simply return the corresponding devid as an alias, +as parsed from IVRS table. + +Signed-off-by: Arindam Nath +Fixes: 2bf9a0a12749 ('iommu/amd: Add iommu support for ACPI HID devices') +Signed-off-by: Joerg Roedel +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iommu/amd_iommu.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/iommu/amd_iommu.c ++++ b/drivers/iommu/amd_iommu.c +@@ -253,7 +253,13 @@ static u16 get_alias(struct device *dev) + + /* The callers make sure that get_device_id() does not fail here */ + devid = get_device_id(dev); ++ ++ /* For ACPI HID devices, we simply return the devid as such */ ++ if (!dev_is_pci(dev)) ++ return devid; ++ + ivrs_alias = amd_iommu_alias_table[devid]; ++ + pci_for_each_dma_alias(pdev, __last_alias, &pci_alias); + + if (ivrs_alias == pci_alias) diff --git a/queue-4.14/media-af9035-prevent-buffer-overflow-on-write.patch b/queue-4.14/media-af9035-prevent-buffer-overflow-on-write.patch new file mode 100644 index 00000000000..e822e1b70da --- /dev/null +++ b/queue-4.14/media-af9035-prevent-buffer-overflow-on-write.patch @@ -0,0 +1,40 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Jozef Balga +Date: Tue, 21 Aug 2018 05:01:04 -0400 +Subject: media: af9035: prevent buffer overflow on write + +From: Jozef Balga + +[ Upstream commit 312f73b648626a0526a3aceebb0a3192aaba05ce ] + +When less than 3 bytes are written to the device, memcpy is called with +negative array size which leads to buffer overflow and kernel panic. This +patch adds a condition and returns -EOPNOTSUPP instead. +Fixes bugzilla issue 64871 + +[mchehab+samsung@kernel.org: fix a merge conflict and changed the + condition to match the patch's comment, e. g. len == 3 could + also be valid] +Signed-off-by: Jozef Balga +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/usb/dvb-usb-v2/af9035.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/media/usb/dvb-usb-v2/af9035.c ++++ b/drivers/media/usb/dvb-usb-v2/af9035.c +@@ -402,8 +402,10 @@ static int af9035_i2c_master_xfer(struct + if (msg[0].addr == state->af9033_i2c_addr[1]) + reg |= 0x100000; + +- ret = af9035_wr_regs(d, reg, &msg[0].buf[3], +- msg[0].len - 3); ++ ret = (msg[0].len >= 3) ? af9035_wr_regs(d, reg, ++ &msg[0].buf[3], ++ msg[0].len - 3) ++ : -EOPNOTSUPP; + } else { + /* I2C write */ + u8 buf[MAX_XFER_SIZE]; diff --git a/queue-4.14/net-emac-fix-fixed-link-setup-for-the-rtl8363sb-switch.patch b/queue-4.14/net-emac-fix-fixed-link-setup-for-the-rtl8363sb-switch.patch new file mode 100644 index 00000000000..430579df312 --- /dev/null +++ b/queue-4.14/net-emac-fix-fixed-link-setup-for-the-rtl8363sb-switch.patch @@ -0,0 +1,54 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Christian Lamparter +Date: Mon, 17 Sep 2018 17:22:40 +0200 +Subject: net: emac: fix fixed-link setup for the RTL8363SB switch + +From: Christian Lamparter + +[ Upstream commit 08e39982ef64f800fd1f9b9b92968d14d5fafa82 ] + +On the Netgear WNDAP620, the emac ethernet isn't receiving nor +xmitting any frames from/to the RTL8363SB (identifies itself +as a RTL8367RB). + +This is caused by the emac hardware not knowing the forced link +parameters for speed, duplex, pause, etc. + +This begs the question, how this was working on the original +driver code, when it was necessary to set the phy_address and +phy_map to 0xffffffff. But I guess without access to the old +PPC405/440/460 hardware, it's not possible to know. + +Signed-off-by: Christian Lamparter +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/ibm/emac/core.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +--- a/drivers/net/ethernet/ibm/emac/core.c ++++ b/drivers/net/ethernet/ibm/emac/core.c +@@ -2671,12 +2671,17 @@ static int emac_init_phy(struct emac_ins + if (of_phy_is_fixed_link(np)) { + int res = emac_dt_mdio_probe(dev); + +- if (!res) { +- res = of_phy_register_fixed_link(np); +- if (res) +- mdiobus_unregister(dev->mii_bus); ++ if (res) ++ return res; ++ ++ res = of_phy_register_fixed_link(np); ++ dev->phy_dev = of_phy_find_device(np); ++ if (res || !dev->phy_dev) { ++ mdiobus_unregister(dev->mii_bus); ++ return res ? res : -EINVAL; + } +- return res; ++ emac_adjust_link(dev->ndev); ++ put_device(&dev->phy_dev->mdio.dev); + } + return 0; + } diff --git a/queue-4.14/net-mlx4-use-cpumask_available-for-eq-affinity_mask.patch b/queue-4.14/net-mlx4-use-cpumask_available-for-eq-affinity_mask.patch new file mode 100644 index 00000000000..af9c8b89fcf --- /dev/null +++ b/queue-4.14/net-mlx4-use-cpumask_available-for-eq-affinity_mask.patch @@ -0,0 +1,44 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Nathan Chancellor +Date: Fri, 21 Sep 2018 02:44:12 -0700 +Subject: net/mlx4: Use cpumask_available for eq->affinity_mask + +From: Nathan Chancellor + +[ Upstream commit 8ac1ee6f4d62e781e3b3fd8b9c42b70371427669 ] + +Clang warns that the address of a pointer will always evaluated as true +in a boolean context: + +drivers/net/ethernet/mellanox/mlx4/eq.c:243:11: warning: address of +array 'eq->affinity_mask' will always evaluate to 'true' +[-Wpointer-bool-conversion] + if (!eq->affinity_mask || cpumask_empty(eq->affinity_mask)) + ~~~~~^~~~~~~~~~~~~ +1 warning generated. + +Use cpumask_available, introduced in commit f7e30f01a9e2 ("cpumask: Add +helper cpumask_available()"), which does the proper checking and avoids +this warning. + +Link: https://github.com/ClangBuiltLinux/linux/issues/86 +Signed-off-by: Nathan Chancellor +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/mellanox/mlx4/eq.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/ethernet/mellanox/mlx4/eq.c ++++ b/drivers/net/ethernet/mellanox/mlx4/eq.c +@@ -240,7 +240,8 @@ static void mlx4_set_eq_affinity_hint(st + struct mlx4_dev *dev = &priv->dev; + struct mlx4_eq *eq = &priv->eq_table.eq[vec]; + +- if (!eq->affinity_mask || cpumask_empty(eq->affinity_mask)) ++ if (!cpumask_available(eq->affinity_mask) || ++ cpumask_empty(eq->affinity_mask)) + return; + + hint_err = irq_set_affinity_hint(eq->irq, eq->affinity_mask); diff --git a/queue-4.14/pci-dwc-fix-scheduling-while-atomic-issues.patch b/queue-4.14/pci-dwc-fix-scheduling-while-atomic-issues.patch new file mode 100644 index 00000000000..304bea53a81 --- /dev/null +++ b/queue-4.14/pci-dwc-fix-scheduling-while-atomic-issues.patch @@ -0,0 +1,89 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Jisheng Zhang +Date: Thu, 20 Sep 2018 16:32:52 -0500 +Subject: PCI: dwc: Fix scheduling while atomic issues + +From: Jisheng Zhang + +[ Upstream commit 9024143e700f89d74b8cdaf316a3499d74fc56fe ] + +When programming the inbound/outbound ATUs, we call usleep_range() after +each checking PCIE_ATU_ENABLE bit. Unfortunately, the ATU programming +can be executed in atomic context: + +inbound ATU programming could be called through +pci_epc_write_header() + =>dw_pcie_ep_write_header() + =>dw_pcie_prog_inbound_atu() + +outbound ATU programming could be called through +pci_bus_read_config_dword() + =>dw_pcie_rd_conf() + =>dw_pcie_prog_outbound_atu() + +Fix this issue by calling mdelay() instead. + +Fixes: f8aed6ec624f ("PCI: dwc: designware: Add EP mode support") +Fixes: d8bbeb39fbf3 ("PCI: designware: Wait for iATU enable") +Signed-off-by: Jisheng Zhang +[lorenzo.pieralisi@arm.com: commit log update] +Signed-off-by: Lorenzo Pieralisi +Signed-off-by: Bjorn Helgaas +Acked-by: Gustavo Pimentel +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pci/dwc/pcie-designware.c | 8 ++++---- + drivers/pci/dwc/pcie-designware.h | 3 +-- + 2 files changed, 5 insertions(+), 6 deletions(-) + +--- a/drivers/pci/dwc/pcie-designware.c ++++ b/drivers/pci/dwc/pcie-designware.c +@@ -138,7 +138,7 @@ static void dw_pcie_prog_outbound_atu_un + if (val & PCIE_ATU_ENABLE) + return; + +- usleep_range(LINK_WAIT_IATU_MIN, LINK_WAIT_IATU_MAX); ++ mdelay(LINK_WAIT_IATU); + } + dev_err(pci->dev, "outbound iATU is not being enabled\n"); + } +@@ -181,7 +181,7 @@ void dw_pcie_prog_outbound_atu(struct dw + if (val & PCIE_ATU_ENABLE) + return; + +- usleep_range(LINK_WAIT_IATU_MIN, LINK_WAIT_IATU_MAX); ++ mdelay(LINK_WAIT_IATU); + } + dev_err(pci->dev, "outbound iATU is not being enabled\n"); + } +@@ -239,7 +239,7 @@ static int dw_pcie_prog_inbound_atu_unro + if (val & PCIE_ATU_ENABLE) + return 0; + +- usleep_range(LINK_WAIT_IATU_MIN, LINK_WAIT_IATU_MAX); ++ mdelay(LINK_WAIT_IATU); + } + dev_err(pci->dev, "inbound iATU is not being enabled\n"); + +@@ -285,7 +285,7 @@ int dw_pcie_prog_inbound_atu(struct dw_p + if (val & PCIE_ATU_ENABLE) + return 0; + +- usleep_range(LINK_WAIT_IATU_MIN, LINK_WAIT_IATU_MAX); ++ mdelay(LINK_WAIT_IATU); + } + dev_err(pci->dev, "inbound iATU is not being enabled\n"); + +--- a/drivers/pci/dwc/pcie-designware.h ++++ b/drivers/pci/dwc/pcie-designware.h +@@ -28,8 +28,7 @@ + + /* Parameters for the waiting for iATU enabled routine */ + #define LINK_WAIT_MAX_IATU_RETRIES 5 +-#define LINK_WAIT_IATU_MIN 9000 +-#define LINK_WAIT_IATU_MAX 10000 ++#define LINK_WAIT_IATU 9 + + /* Synopsys-specific PCIe configuration registers */ + #define PCIE_PORT_LINK_CONTROL 0x710 diff --git a/queue-4.14/powerpc-lib-feature-fixups-use-raw_patch_instruction.patch b/queue-4.14/powerpc-lib-feature-fixups-use-raw_patch_instruction.patch new file mode 100644 index 00000000000..405ee6bc8a8 --- /dev/null +++ b/queue-4.14/powerpc-lib-feature-fixups-use-raw_patch_instruction.patch @@ -0,0 +1,97 @@ +From 8183d99f4a22c2abbc543847a588df3666ef0c0c Mon Sep 17 00:00:00 2001 +From: Christophe Leroy +Date: Fri, 24 Nov 2017 08:31:09 +0100 +Subject: powerpc/lib/feature-fixups: use raw_patch_instruction() + +From: Christophe Leroy + +commit 8183d99f4a22c2abbc543847a588df3666ef0c0c upstream. + +feature fixups need to use patch_instruction() early in the boot, +even before the code is relocated to its final address, requiring +patch_instruction() to use PTRRELOC() in order to address data. + +But feature fixups applies on code before it is set to read only, +even for modules. Therefore, feature fixups can use +raw_patch_instruction() instead. + +Signed-off-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Reported-by: David Gounaris +Tested-by: David Gounaris +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/include/asm/code-patching.h | 1 + + arch/powerpc/lib/code-patching.c | 4 ++-- + arch/powerpc/lib/feature-fixups.c | 8 ++++---- + 3 files changed, 7 insertions(+), 6 deletions(-) + +--- a/arch/powerpc/include/asm/code-patching.h ++++ b/arch/powerpc/include/asm/code-patching.h +@@ -31,6 +31,7 @@ unsigned int create_cond_branch(const un + unsigned long target, int flags); + int patch_branch(unsigned int *addr, unsigned long target, int flags); + int patch_instruction(unsigned int *addr, unsigned int instr); ++int raw_patch_instruction(unsigned int *addr, unsigned int instr); + + int instr_is_relative_branch(unsigned int instr); + int instr_is_relative_link_branch(unsigned int instr); +--- a/arch/powerpc/lib/code-patching.c ++++ b/arch/powerpc/lib/code-patching.c +@@ -39,7 +39,7 @@ static int __patch_instruction(unsigned + return 0; + } + +-static int raw_patch_instruction(unsigned int *addr, unsigned int instr) ++int raw_patch_instruction(unsigned int *addr, unsigned int instr) + { + return __patch_instruction(addr, instr, addr); + } +@@ -156,7 +156,7 @@ static int do_patch_instruction(unsigned + * when text_poke_area is not ready, but we still need + * to allow patching. We just do the plain old patching + */ +- if (!this_cpu_read(*PTRRELOC(&text_poke_area))) ++ if (!this_cpu_read(text_poke_area)) + return raw_patch_instruction(addr, instr); + + local_irq_save(flags); +--- a/arch/powerpc/lib/feature-fixups.c ++++ b/arch/powerpc/lib/feature-fixups.c +@@ -63,7 +63,7 @@ static int patch_alt_instruction(unsigne + } + } + +- patch_instruction(dest, instr); ++ raw_patch_instruction(dest, instr); + + return 0; + } +@@ -92,7 +92,7 @@ static int patch_feature_section(unsigne + } + + for (; dest < end; dest++) +- patch_instruction(dest, PPC_INST_NOP); ++ raw_patch_instruction(dest, PPC_INST_NOP); + + return 0; + } +@@ -292,7 +292,7 @@ void do_lwsync_fixups(unsigned long valu + + for (; start < end; start++) { + dest = (void *)start + *start; +- patch_instruction(dest, PPC_INST_LWSYNC); ++ raw_patch_instruction(dest, PPC_INST_LWSYNC); + } + } + +@@ -310,7 +310,7 @@ static void do_final_fixups(void) + length = (__end_interrupts - _stext) / sizeof(int); + + while (length--) { +- patch_instruction(dest, *src); ++ raw_patch_instruction(dest, *src); + src++; + dest++; + } diff --git a/queue-4.14/powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch b/queue-4.14/powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch new file mode 100644 index 00000000000..31425f02cb1 --- /dev/null +++ b/queue-4.14/powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch @@ -0,0 +1,59 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Michael Neuling +Date: Tue, 25 Sep 2018 19:36:47 +1000 +Subject: powerpc/tm: Avoid possible userspace r1 corruption on reclaim + +From: Michael Neuling + +[ Upstream commit 96dc89d526ef77604376f06220e3d2931a0bfd58 ] + +Current we store the userspace r1 to PACATMSCRATCH before finally +saving it to the thread struct. + +In theory an exception could be taken here (like a machine check or +SLB miss) that could write PACATMSCRATCH and hence corrupt the +userspace r1. The SLB fault currently doesn't touch PACATMSCRATCH, but +others do. + +We've never actually seen this happen but it's theoretically +possible. Either way, the code is fragile as it is. + +This patch saves r1 to the kernel stack (which can't fault) before we +turn MSR[RI] back on. PACATMSCRATCH is still used but only with +MSR[RI] off. We then copy r1 from the kernel stack to the thread +struct once we have MSR[RI] back on. + +Suggested-by: Breno Leitao +Signed-off-by: Michael Neuling +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/kernel/tm.S | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/arch/powerpc/kernel/tm.S ++++ b/arch/powerpc/kernel/tm.S +@@ -170,6 +170,13 @@ _GLOBAL(tm_reclaim) + std r11, GPR11(r1) /* Temporary stash */ + + /* ++ * Move the saved user r1 to the kernel stack in case PACATMSCRATCH is ++ * clobbered by an exception once we turn on MSR_RI below. ++ */ ++ ld r11, PACATMSCRATCH(r13) ++ std r11, GPR1(r1) ++ ++ /* + * Store r13 away so we can free up the scratch SPR for the SLB fault + * handler (needed once we start accessing the thread_struct). + */ +@@ -205,7 +212,7 @@ _GLOBAL(tm_reclaim) + SAVE_GPR(8, r7) /* user r8 */ + SAVE_GPR(9, r7) /* user r9 */ + SAVE_GPR(10, r7) /* user r10 */ +- ld r3, PACATMSCRATCH(r13) /* user r1 */ ++ ld r3, GPR1(r1) /* user r1 */ + ld r4, GPR7(r1) /* user r7 */ + ld r5, GPR11(r1) /* user r11 */ + ld r6, GPR12(r1) /* user r12 */ diff --git a/queue-4.14/powerpc-tm-fix-userspace-r13-corruption.patch b/queue-4.14/powerpc-tm-fix-userspace-r13-corruption.patch new file mode 100644 index 00000000000..e45a3dd4120 --- /dev/null +++ b/queue-4.14/powerpc-tm-fix-userspace-r13-corruption.patch @@ -0,0 +1,64 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Michael Neuling +Date: Mon, 24 Sep 2018 17:27:04 +1000 +Subject: powerpc/tm: Fix userspace r13 corruption + +From: Michael Neuling + +[ Upstream commit cf13435b730a502e814c63c84d93db131e563f5f ] + +When we treclaim we store the userspace checkpointed r13 to a scratch +SPR and then later save the scratch SPR to the user thread struct. + +Unfortunately, this doesn't work as accessing the user thread struct +can take an SLB fault and the SLB fault handler will write the same +scratch SPRG that now contains the userspace r13. + +To fix this, we store r13 to the kernel stack (which can't fault) +before we access the user thread struct. + +Found by running P8 guest + powervm + disable_1tb_segments + TM. Seen +as a random userspace segfault with r13 looking like a kernel address. + +Signed-off-by: Michael Neuling +Reviewed-by: Breno Leitao +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/kernel/tm.S | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/arch/powerpc/kernel/tm.S ++++ b/arch/powerpc/kernel/tm.S +@@ -167,13 +167,20 @@ _GLOBAL(tm_reclaim) + std r1, PACATMSCRATCH(r13) + ld r1, PACAR1(r13) + +- /* Store the PPR in r11 and reset to decent value */ + std r11, GPR11(r1) /* Temporary stash */ + ++ /* ++ * Store r13 away so we can free up the scratch SPR for the SLB fault ++ * handler (needed once we start accessing the thread_struct). ++ */ ++ GET_SCRATCH0(r11) ++ std r11, GPR13(r1) ++ + /* Reset MSR RI so we can take SLB faults again */ + li r11, MSR_RI + mtmsrd r11, 1 + ++ /* Store the PPR in r11 and reset to decent value */ + mfspr r11, SPRN_PPR + HMT_MEDIUM + +@@ -202,7 +209,7 @@ _GLOBAL(tm_reclaim) + ld r4, GPR7(r1) /* user r7 */ + ld r5, GPR11(r1) /* user r11 */ + ld r6, GPR12(r1) /* user r12 */ +- GET_SCRATCH0(8) /* user r13 */ ++ ld r8, GPR13(r1) /* user r13 */ + std r3, GPR1(r7) + std r4, GPR7(r7) + std r5, GPR11(r7) diff --git a/queue-4.14/ravb-do-not-write-1-to-reserved-bits.patch b/queue-4.14/ravb-do-not-write-1-to-reserved-bits.patch new file mode 100644 index 00000000000..0cac3823bb7 --- /dev/null +++ b/queue-4.14/ravb-do-not-write-1-to-reserved-bits.patch @@ -0,0 +1,128 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Kazuya Mizuguchi +Date: Tue, 18 Sep 2018 12:22:26 +0200 +Subject: ravb: do not write 1 to reserved bits + +From: Kazuya Mizuguchi + +[ Upstream commit 2fe397a3959de8a472f165e6d152f64cb77fa2cc ] + +EtherAVB hardware requires 0 to be written to status register bits in +order to clear them, however, care must be taken not to: + +1. Clear other bits, by writing zero to them +2. Write one to reserved bits + +This patch corrects the ravb driver with respect to the second point above. +This is done by defining reserved bit masks for the affected registers and, +after auditing the code, ensure all sites that may write a one to a +reserved bit use are suitably masked. + +Signed-off-by: Kazuya Mizuguchi +Signed-off-by: Simon Horman +Reviewed-by: Sergei Shtylyov +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/renesas/ravb.h | 5 +++++ + drivers/net/ethernet/renesas/ravb_main.c | 11 ++++++----- + drivers/net/ethernet/renesas/ravb_ptp.c | 2 +- + 3 files changed, 12 insertions(+), 6 deletions(-) + +--- a/drivers/net/ethernet/renesas/ravb.h ++++ b/drivers/net/ethernet/renesas/ravb.h +@@ -431,6 +431,7 @@ enum EIS_BIT { + EIS_CULF1 = 0x00000080, + EIS_TFFF = 0x00000100, + EIS_QFS = 0x00010000, ++ EIS_RESERVED = (GENMASK(31, 17) | GENMASK(15, 11)), + }; + + /* RIC0 */ +@@ -475,6 +476,7 @@ enum RIS0_BIT { + RIS0_FRF15 = 0x00008000, + RIS0_FRF16 = 0x00010000, + RIS0_FRF17 = 0x00020000, ++ RIS0_RESERVED = GENMASK(31, 18), + }; + + /* RIC1 */ +@@ -531,6 +533,7 @@ enum RIS2_BIT { + RIS2_QFF16 = 0x00010000, + RIS2_QFF17 = 0x00020000, + RIS2_RFFF = 0x80000000, ++ RIS2_RESERVED = GENMASK(30, 18), + }; + + /* TIC */ +@@ -547,6 +550,7 @@ enum TIS_BIT { + TIS_FTF1 = 0x00000002, /* Undocumented? */ + TIS_TFUF = 0x00000100, + TIS_TFWF = 0x00000200, ++ TIS_RESERVED = (GENMASK(31, 20) | GENMASK(15, 12) | GENMASK(7, 4)) + }; + + /* ISS */ +@@ -620,6 +624,7 @@ enum GIC_BIT { + enum GIS_BIT { + GIS_PTCF = 0x00000001, /* Undocumented? */ + GIS_PTMF = 0x00000004, ++ GIS_RESERVED = GENMASK(15, 10), + }; + + /* GIE (R-Car Gen3 only) */ +--- a/drivers/net/ethernet/renesas/ravb_main.c ++++ b/drivers/net/ethernet/renesas/ravb_main.c +@@ -721,10 +721,11 @@ static void ravb_error_interrupt(struct + u32 eis, ris2; + + eis = ravb_read(ndev, EIS); +- ravb_write(ndev, ~EIS_QFS, EIS); ++ ravb_write(ndev, ~(EIS_QFS | EIS_RESERVED), EIS); + if (eis & EIS_QFS) { + ris2 = ravb_read(ndev, RIS2); +- ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF), RIS2); ++ ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF | RIS2_RESERVED), ++ RIS2); + + /* Receive Descriptor Empty int */ + if (ris2 & RIS2_QFF0) +@@ -777,7 +778,7 @@ static bool ravb_timestamp_interrupt(str + u32 tis = ravb_read(ndev, TIS); + + if (tis & TIS_TFUF) { +- ravb_write(ndev, ~TIS_TFUF, TIS); ++ ravb_write(ndev, ~(TIS_TFUF | TIS_RESERVED), TIS); + ravb_get_tx_tstamp(ndev); + return true; + } +@@ -912,7 +913,7 @@ static int ravb_poll(struct napi_struct + /* Processing RX Descriptor Ring */ + if (ris0 & mask) { + /* Clear RX interrupt */ +- ravb_write(ndev, ~mask, RIS0); ++ ravb_write(ndev, ~(mask | RIS0_RESERVED), RIS0); + if (ravb_rx(ndev, "a, q)) + goto out; + } +@@ -920,7 +921,7 @@ static int ravb_poll(struct napi_struct + if (tis & mask) { + spin_lock_irqsave(&priv->lock, flags); + /* Clear TX interrupt */ +- ravb_write(ndev, ~mask, TIS); ++ ravb_write(ndev, ~(mask | TIS_RESERVED), TIS); + ravb_tx_free(ndev, q, true); + netif_wake_subqueue(ndev, q); + mmiowb(); +--- a/drivers/net/ethernet/renesas/ravb_ptp.c ++++ b/drivers/net/ethernet/renesas/ravb_ptp.c +@@ -319,7 +319,7 @@ void ravb_ptp_interrupt(struct net_devic + } + } + +- ravb_write(ndev, ~gis, GIS); ++ ravb_write(ndev, ~(gis | GIS_RESERVED), GIS); + } + + void ravb_ptp_init(struct net_device *ndev, struct platform_device *pdev) diff --git a/queue-4.14/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch b/queue-4.14/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch new file mode 100644 index 00000000000..100b923bfe7 --- /dev/null +++ b/queue-4.14/risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch @@ -0,0 +1,42 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: James Cowgill +Date: Thu, 6 Sep 2018 22:57:56 +0100 +Subject: RISC-V: include linux/ftrace.h in asm-prototypes.h + +From: James Cowgill + +[ Upstream commit 57a489786de9ec37d6e25ef1305dc337047f0236 ] + +Building a riscv kernel with CONFIG_FUNCTION_TRACER and +CONFIG_MODVERSIONS enabled results in these two warnings: + + MODPOST vmlinux.o +WARNING: EXPORT symbol "return_to_handler" [vmlinux] version generation failed, symbol will not be versioned. +WARNING: EXPORT symbol "_mcount" [vmlinux] version generation failed, symbol will not be versioned. + +When exporting symbols from an assembly file, the MODVERSIONS code +requires their prototypes to be defined in asm-prototypes.h (see +scripts/Makefile.build). Since both of these symbols have prototypes +defined in linux/ftrace.h, include this header from RISC-V's +asm-prototypes.h. + +Reported-by: Karsten Merker +Signed-off-by: James Cowgill +Signed-off-by: Palmer Dabbelt +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/riscv/include/asm/asm-prototypes.h | 7 +++++++ + 1 file changed, 7 insertions(+) + create mode 100644 arch/riscv/include/asm/asm-prototypes.h + +--- /dev/null ++++ b/arch/riscv/include/asm/asm-prototypes.h +@@ -0,0 +1,7 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++#ifndef _ASM_RISCV_PROTOTYPES_H ++ ++#include ++#include ++ ++#endif /* _ASM_RISCV_PROTOTYPES_H */ diff --git a/queue-4.14/scsi-ibmvscsis-ensure-partition-name-is-properly-nul-terminated.patch b/queue-4.14/scsi-ibmvscsis-ensure-partition-name-is-properly-nul-terminated.patch new file mode 100644 index 00000000000..cc10a492a64 --- /dev/null +++ b/queue-4.14/scsi-ibmvscsis-ensure-partition-name-is-properly-nul-terminated.patch @@ -0,0 +1,34 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Laura Abbott +Date: Tue, 11 Sep 2018 12:22:26 -0700 +Subject: scsi: ibmvscsis: Ensure partition name is properly NUL terminated + +From: Laura Abbott + +[ Upstream commit adad633af7b970bfa5dd1b624a4afc83cac9b235 ] + +While reviewing another part of the code, Kees noticed that the strncpy of the +partition name might not always be NUL terminated. Switch to using strscpy +which does this safely. + +Reported-by: Kees Cook +Signed-off-by: Laura Abbott +Reviewed-by: Kees Cook +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c ++++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +@@ -3468,7 +3468,7 @@ static int ibmvscsis_probe(struct vio_de + snprintf(vscsi->eye, sizeof(vscsi->eye), "VSCSI %s", vdev->name); + + vscsi->dds.unit_id = vdev->unit_address; +- strncpy(vscsi->dds.partition_name, partition_name, ++ strscpy(vscsi->dds.partition_name, partition_name, + sizeof(vscsi->dds.partition_name)); + vscsi->dds.partition_num = partition_number; + diff --git a/queue-4.14/scsi-ibmvscsis-fix-a-stringop-overflow-warning.patch b/queue-4.14/scsi-ibmvscsis-fix-a-stringop-overflow-warning.patch new file mode 100644 index 00000000000..25a3bff94c2 --- /dev/null +++ b/queue-4.14/scsi-ibmvscsis-fix-a-stringop-overflow-warning.patch @@ -0,0 +1,41 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Laura Abbott +Date: Tue, 11 Sep 2018 12:22:25 -0700 +Subject: scsi: ibmvscsis: Fix a stringop-overflow warning + +From: Laura Abbott + +[ Upstream commit d792d4c4fc866ae224b0b0ca2aabd87d23b4d6cc ] + +There's currently a warning about string overflow with strncat: + +drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c: In function 'ibmvscsis_probe': +drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:3479:2: error: 'strncat' specified +bound 64 equals destination size [-Werror=stringop-overflow=] + strncat(vscsi->eye, vdev->name, MAX_EYE); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Switch to a single snprintf instead of a strcpy + strcat to handle this +cleanly. + +Signed-off-by: Laura Abbott +Suggested-by: Kees Cook +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c ++++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +@@ -3465,8 +3465,7 @@ static int ibmvscsis_probe(struct vio_de + vscsi->dds.window[LOCAL].liobn, + vscsi->dds.window[REMOTE].liobn); + +- strcpy(vscsi->eye, "VSCSI "); +- strncat(vscsi->eye, vdev->name, MAX_EYE); ++ snprintf(vscsi->eye, sizeof(vscsi->eye), "VSCSI %s", vdev->name); + + vscsi->dds.unit_id = vdev->unit_address; + strncpy(vscsi->dds.partition_name, partition_name, diff --git a/queue-4.14/scsi-ipr-system-hung-while-dlpar-adding-primary-ipr-adapter-back.patch b/queue-4.14/scsi-ipr-system-hung-while-dlpar-adding-primary-ipr-adapter-back.patch new file mode 100644 index 00000000000..8c3fb42a0a8 --- /dev/null +++ b/queue-4.14/scsi-ipr-system-hung-while-dlpar-adding-primary-ipr-adapter-back.patch @@ -0,0 +1,181 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Wen Xiong +Date: Thu, 20 Sep 2018 19:32:12 -0500 +Subject: scsi: ipr: System hung while dlpar adding primary ipr adapter back + +From: Wen Xiong + +[ Upstream commit 318ddb34b2052f838aa243d07173e2badf3e630e ] + +While dlpar adding primary ipr adapter back, driver goes through adapter +initialization then schedule ipr_worker_thread to start te disk scan by +dropping the host lock, calling scsi_add_device. Then get the adapter reset +request again, so driver does scsi_block_requests, this will cause the +scsi_add_device get hung until we unblock. But we can't run ipr_worker_thread +to do the unblock because its stuck in scsi_add_device. + +This patch fixes the issue. + +[mkp: typo and whitespace fixes] + +Signed-off-by: Wen Xiong +Acked-by: Brian King +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/ipr.c | 106 ++++++++++++++++++++++++++++++----------------------- + drivers/scsi/ipr.h | 1 + 2 files changed, 62 insertions(+), 45 deletions(-) + +--- a/drivers/scsi/ipr.c ++++ b/drivers/scsi/ipr.c +@@ -3308,6 +3308,65 @@ static void ipr_release_dump(struct kref + LEAVE; + } + ++static void ipr_add_remove_thread(struct work_struct *work) ++{ ++ unsigned long lock_flags; ++ struct ipr_resource_entry *res; ++ struct scsi_device *sdev; ++ struct ipr_ioa_cfg *ioa_cfg = ++ container_of(work, struct ipr_ioa_cfg, scsi_add_work_q); ++ u8 bus, target, lun; ++ int did_work; ++ ++ ENTER; ++ spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); ++ ++restart: ++ do { ++ did_work = 0; ++ if (!ioa_cfg->hrrq[IPR_INIT_HRRQ].allow_cmds) { ++ spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); ++ return; ++ } ++ ++ list_for_each_entry(res, &ioa_cfg->used_res_q, queue) { ++ if (res->del_from_ml && res->sdev) { ++ did_work = 1; ++ sdev = res->sdev; ++ if (!scsi_device_get(sdev)) { ++ if (!res->add_to_ml) ++ list_move_tail(&res->queue, &ioa_cfg->free_res_q); ++ else ++ res->del_from_ml = 0; ++ spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); ++ scsi_remove_device(sdev); ++ scsi_device_put(sdev); ++ spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); ++ } ++ break; ++ } ++ } ++ } while (did_work); ++ ++ list_for_each_entry(res, &ioa_cfg->used_res_q, queue) { ++ if (res->add_to_ml) { ++ bus = res->bus; ++ target = res->target; ++ lun = res->lun; ++ res->add_to_ml = 0; ++ spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); ++ scsi_add_device(ioa_cfg->host, bus, target, lun); ++ spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); ++ goto restart; ++ } ++ } ++ ++ ioa_cfg->scan_done = 1; ++ spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); ++ kobject_uevent(&ioa_cfg->host->shost_dev.kobj, KOBJ_CHANGE); ++ LEAVE; ++} ++ + /** + * ipr_worker_thread - Worker thread + * @work: ioa config struct +@@ -3322,13 +3381,9 @@ static void ipr_release_dump(struct kref + static void ipr_worker_thread(struct work_struct *work) + { + unsigned long lock_flags; +- struct ipr_resource_entry *res; +- struct scsi_device *sdev; + struct ipr_dump *dump; + struct ipr_ioa_cfg *ioa_cfg = + container_of(work, struct ipr_ioa_cfg, work_q); +- u8 bus, target, lun; +- int did_work; + + ENTER; + spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); +@@ -3366,49 +3421,9 @@ static void ipr_worker_thread(struct wor + return; + } + +-restart: +- do { +- did_work = 0; +- if (!ioa_cfg->hrrq[IPR_INIT_HRRQ].allow_cmds) { +- spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); +- return; +- } ++ schedule_work(&ioa_cfg->scsi_add_work_q); + +- list_for_each_entry(res, &ioa_cfg->used_res_q, queue) { +- if (res->del_from_ml && res->sdev) { +- did_work = 1; +- sdev = res->sdev; +- if (!scsi_device_get(sdev)) { +- if (!res->add_to_ml) +- list_move_tail(&res->queue, &ioa_cfg->free_res_q); +- else +- res->del_from_ml = 0; +- spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); +- scsi_remove_device(sdev); +- scsi_device_put(sdev); +- spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); +- } +- break; +- } +- } +- } while (did_work); +- +- list_for_each_entry(res, &ioa_cfg->used_res_q, queue) { +- if (res->add_to_ml) { +- bus = res->bus; +- target = res->target; +- lun = res->lun; +- res->add_to_ml = 0; +- spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); +- scsi_add_device(ioa_cfg->host, bus, target, lun); +- spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); +- goto restart; +- } +- } +- +- ioa_cfg->scan_done = 1; + spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); +- kobject_uevent(&ioa_cfg->host->shost_dev.kobj, KOBJ_CHANGE); + LEAVE; + } + +@@ -9937,6 +9952,7 @@ static void ipr_init_ioa_cfg(struct ipr_ + INIT_LIST_HEAD(&ioa_cfg->free_res_q); + INIT_LIST_HEAD(&ioa_cfg->used_res_q); + INIT_WORK(&ioa_cfg->work_q, ipr_worker_thread); ++ INIT_WORK(&ioa_cfg->scsi_add_work_q, ipr_add_remove_thread); + init_waitqueue_head(&ioa_cfg->reset_wait_q); + init_waitqueue_head(&ioa_cfg->msi_wait_q); + init_waitqueue_head(&ioa_cfg->eeh_wait_q); +--- a/drivers/scsi/ipr.h ++++ b/drivers/scsi/ipr.h +@@ -1568,6 +1568,7 @@ struct ipr_ioa_cfg { + u8 saved_mode_page_len; + + struct work_struct work_q; ++ struct work_struct scsi_add_work_q; + struct workqueue_struct *reset_work_q; + + wait_queue_head_t reset_wait_q; diff --git a/queue-4.14/scsi-sd-don-t-crash-the-host-on-invalid-commands.patch b/queue-4.14/scsi-sd-don-t-crash-the-host-on-invalid-commands.patch new file mode 100644 index 00000000000..cd9edc04239 --- /dev/null +++ b/queue-4.14/scsi-sd-don-t-crash-the-host-on-invalid-commands.patch @@ -0,0 +1,44 @@ +From foo@baz Thu Oct 18 11:10:09 CEST 2018 +From: Johannes Thumshirn +Date: Fri, 21 Sep 2018 09:01:01 +0200 +Subject: scsi: sd: don't crash the host on invalid commands + +From: Johannes Thumshirn + +[ Upstream commit f1f1fadacaf08b7cf11714c0c29f8fa4d4ef68a9 ] + +When sd_init_command() get's a command with a unknown req_op() it crashes the +system via BUG(). + +This makes debugging the actual reason for the broken request cmd_flags pretty +hard as the system is down before it's able to write out debugging data on the +serial console or the trace buffer. + +Change the BUG() to a WARN_ON() and return BLKPREP_KILL to fail gracefully and +return an I/O error to the producer of the request. + +Signed-off-by: Johannes Thumshirn +Cc: Hannes Reinecke +Cc: Bart Van Assche +Cc: Christoph Hellwig +Reviewed-by: Christoph Hellwig +Reviewed-by: Bart Van Assche +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/sd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/scsi/sd.c ++++ b/drivers/scsi/sd.c +@@ -1285,7 +1285,8 @@ static int sd_init_command(struct scsi_c + case REQ_OP_ZONE_RESET: + return sd_zbc_setup_reset_cmnd(cmd); + default: +- BUG(); ++ WARN_ON_ONCE(1); ++ return BLKPREP_KILL; + } + } + diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..d149965c27f --- /dev/null +++ b/queue-4.14/series @@ -0,0 +1,30 @@ +media-af9035-prevent-buffer-overflow-on-write.patch +batman-adv-avoid-probe-elp-information-leak.patch +batman-adv-fix-segfault-when-writing-to-throughput_override.patch +batman-adv-fix-segfault-when-writing-to-sysfs-elp_interval.patch +batman-adv-prevent-duplicated-gateway_node-entry.patch +batman-adv-prevent-duplicated-nc_node-entry.patch +batman-adv-prevent-duplicated-softif_vlan-entry.patch +batman-adv-prevent-duplicated-global-tt-entry.patch +batman-adv-prevent-duplicated-tvlv-handler.patch +batman-adv-fix-backbone_gw-refcount-on-queue_work-failure.patch +batman-adv-fix-hardif_neigh-refcount-on-queue_work-failure.patch +clocksource-drivers-ti-32k-add-clock_source_suspend_nonstop-flag-for-non-am43-socs.patch +scsi-ibmvscsis-fix-a-stringop-overflow-warning.patch +scsi-ibmvscsis-ensure-partition-name-is-properly-nul-terminated.patch +intel_th-pci-add-ice-lake-pch-support.patch +input-atakbd-fix-atari-keymap.patch +input-atakbd-fix-atari-capslock-behaviour.patch +net-emac-fix-fixed-link-setup-for-the-rtl8363sb-switch.patch +ravb-do-not-write-1-to-reserved-bits.patch +pci-dwc-fix-scheduling-while-atomic-issues.patch +drm-mali-dp-call-drm_crtc_vblank_reset-on-device-init.patch +scsi-ipr-system-hung-while-dlpar-adding-primary-ipr-adapter-back.patch +scsi-sd-don-t-crash-the-host-on-invalid-commands.patch +net-mlx4-use-cpumask_available-for-eq-affinity_mask.patch +clocksource-drivers-fttmr010-fix-set_next_event-handler.patch +risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch +powerpc-tm-fix-userspace-r13-corruption.patch +powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch +iommu-amd-return-devid-as-alias-for-acpi-hid-devices.patch +powerpc-lib-feature-fixups-use-raw_patch_instruction.patch diff --git a/queue-4.18/series b/queue-4.18/series new file mode 100644 index 00000000000..c5415b8f8da --- /dev/null +++ b/queue-4.18/series @@ -0,0 +1,49 @@ +soundwire-fix-duplicate-stream-state-assignment.patch +soundwire-fix-incorrect-exit-after-configuring-stream.patch +soundwire-fix-acquiring-bus-lock-twice-during-master-release.patch +media-af9035-prevent-buffer-overflow-on-write.patch +spi-gpio-fix-copy-and-paste-error.patch +batman-adv-avoid-probe-elp-information-leak.patch +batman-adv-fix-segfault-when-writing-to-throughput_override.patch +batman-adv-fix-segfault-when-writing-to-sysfs-elp_interval.patch +batman-adv-prevent-duplicated-gateway_node-entry.patch +batman-adv-prevent-duplicated-nc_node-entry.patch +batman-adv-prevent-duplicated-softif_vlan-entry.patch +batman-adv-prevent-duplicated-global-tt-entry.patch +batman-adv-prevent-duplicated-tvlv-handler.patch +batman-adv-fix-backbone_gw-refcount-on-queue_work-failure.patch +batman-adv-fix-hardif_neigh-refcount-on-queue_work-failure.patch +cxgb4-fix-abort_req_rss6-struct.patch +clocksource-drivers-ti-32k-add-clock_source_suspend_nonstop-flag-for-non-am43-socs.patch +scsi-ibmvscsis-fix-a-stringop-overflow-warning.patch +scsi-ibmvscsis-ensure-partition-name-is-properly-nul-terminated.patch +intel_th-pci-add-ice-lake-pch-support.patch +input-atakbd-fix-atari-keymap.patch +input-atakbd-fix-atari-capslock-behaviour.patch +selftests-pmtu-properly-redirect-stderr-to-dev-null.patch +net-emac-fix-fixed-link-setup-for-the-rtl8363sb-switch.patch +ravb-do-not-write-1-to-reserved-bits.patch +net-smc-fix-non-blocking-connect-problem.patch +net-smc-fix-sizeof-to-int-comparison.patch +qed-fix-populating-the-invalid-stag-value-in-multi-function-mode.patch +qed-do-not-add-vlan-0-tag-to-untagged-frames-in-multi-function-mode.patch +pci-dwc-fix-scheduling-while-atomic-issues.patch +rdma-uverbs-fix-validity-check-for-modify-qp.patch +scsi-lpfc-synchronize-access-to-remoteport-via-rport.patch +drm-mali-dp-call-drm_crtc_vblank_reset-on-device-init.patch +scsi-ipr-system-hung-while-dlpar-adding-primary-ipr-adapter-back.patch +scsi-sd-don-t-crash-the-host-on-invalid-commands.patch +bpf-sockmap-only-allow-established-sock-state.patch +bpf-sockmap-fix-transition-through-disconnect-without-close.patch +bpf-test_maps-only-support-established-socks.patch +net-mlx4-use-cpumask_available-for-eq-affinity_mask.patch +clocksource-drivers-fttmr010-fix-set_next_event-handler.patch +rdma-bnxt_re-fix-system-crash-during-rdma-resource-initialization.patch +risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch +iommu-rockchip-free-irqs-in-shutdown-handler.patch +pinctrl-amd-poll-interruptenable-bits-in-amd_gpio_irq_set_type.patch +powerpc-tm-fix-userspace-r13-corruption.patch +powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch +powerpc-numa-use-associativity-if-vphn-hcall-is-successful.patch +iommu-amd-return-devid-as-alias-for-acpi-hid-devices.patch +x86-boot-fix-kexec-booting-failure-in-the-sev-bit-detection-code.patch diff --git a/queue-4.9/series b/queue-4.9/series new file mode 100644 index 00000000000..23bccff40f3 --- /dev/null +++ b/queue-4.9/series @@ -0,0 +1,22 @@ +media-af9035-prevent-buffer-overflow-on-write.patch +batman-adv-fix-segfault-when-writing-to-throughput_override.patch +batman-adv-fix-segfault-when-writing-to-sysfs-elp_interval.patch +batman-adv-prevent-duplicated-nc_node-entry.patch +batman-adv-prevent-duplicated-softif_vlan-entry.patch +batman-adv-prevent-duplicated-global-tt-entry.patch +batman-adv-prevent-duplicated-tvlv-handler.patch +batman-adv-fix-backbone_gw-refcount-on-queue_work-failure.patch +batman-adv-fix-hardif_neigh-refcount-on-queue_work-failure.patch +clocksource-drivers-ti-32k-add-clock_source_suspend_nonstop-flag-for-non-am43-socs.patch +scsi-ibmvscsis-fix-a-stringop-overflow-warning.patch +scsi-ibmvscsis-ensure-partition-name-is-properly-nul-terminated.patch +input-atakbd-fix-atari-keymap.patch +input-atakbd-fix-atari-capslock-behaviour.patch +ravb-do-not-write-1-to-reserved-bits.patch +drm-mali-dp-call-drm_crtc_vblank_reset-on-device-init.patch +scsi-sd-don-t-crash-the-host-on-invalid-commands.patch +net-mlx4-use-cpumask_available-for-eq-affinity_mask.patch +risc-v-include-linux-ftrace.h-in-asm-prototypes.h.patch +powerpc-tm-fix-userspace-r13-corruption.patch +powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch +iommu-amd-return-devid-as-alias-for-acpi-hid-devices.patch