From 37cf3d5047bfd74dfe22f9ae880532e491b43cfa Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 11 Nov 2018 06:23:16 -0800 Subject: [PATCH] drop some broken 4.4 patches --- ...-component-pointer-in-private-struct.patch | 38 --------------- ...fcmrvl_uart-fix-of-child-node-lookup.patch | 46 ------------------- queue-4.4/series | 2 - 3 files changed, 86 deletions(-) delete mode 100644 queue-4.4/asoc-sta32x-set-component-pointer-in-private-struct.patch delete mode 100644 queue-4.4/nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch diff --git a/queue-4.4/asoc-sta32x-set-component-pointer-in-private-struct.patch b/queue-4.4/asoc-sta32x-set-component-pointer-in-private-struct.patch deleted file mode 100644 index e22d4d86a64..00000000000 --- a/queue-4.4/asoc-sta32x-set-component-pointer-in-private-struct.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 747df19747bc9752cd40b9cce761e17a033aa5c2 Mon Sep 17 00:00:00 2001 -From: Daniel Mack -Date: Thu, 11 Oct 2018 20:32:05 +0200 -Subject: ASoC: sta32x: set ->component pointer in private struct - -From: Daniel Mack - -commit 747df19747bc9752cd40b9cce761e17a033aa5c2 upstream. - -The ESD watchdog code in sta32x_watchdog() dereferences the pointer -which is never assigned. - -This is a regression from a1be4cead9b950 ("ASoC: sta32x: Convert to direct -regmap API usage.") which went unnoticed since nobody seems to use that ESD -workaround. - -Fixes: a1be4cead9b950 ("ASoC: sta32x: Convert to direct regmap API usage.") -Signed-off-by: Daniel Mack -Signed-off-by: Mark Brown -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman - ---- - sound/soc/codecs/sta32x.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/sound/soc/codecs/sta32x.c -+++ b/sound/soc/codecs/sta32x.c -@@ -880,6 +880,9 @@ static int sta32x_probe(struct snd_soc_c - struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec); - struct sta32x_platform_data *pdata = sta32x->pdata; - int i, ret = 0, thermal = 0; -+ -+ sta32x->component = component; -+ - ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies), - sta32x->supplies); - if (ret != 0) { diff --git a/queue-4.4/nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch b/queue-4.4/nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch deleted file mode 100644 index 63b412735cd..00000000000 --- a/queue-4.4/nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5bf59773aaf36dd62117dc83d50e1bbf9ef432da Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Mon, 27 Aug 2018 10:21:52 +0200 -Subject: NFC: nfcmrvl_uart: fix OF child-node lookup - -From: Johan Hovold - -commit 5bf59773aaf36dd62117dc83d50e1bbf9ef432da upstream. - -Use the new of_get_compatible_child() helper to lookup the nfc child -node instead of using of_find_compatible_node(), which searches the -entire tree from a given start node and thus can return an unrelated -(i.e. non-child) node. - -This also addresses a potential use-after-free (e.g. after probe -deferral) as the tree-wide helper drops a reference to its first -argument (i.e. the parent node). - -Fixes: e097dc624f78 ("NFC: nfcmrvl: add UART driver") -Fixes: d8e018c0b321 ("NFC: nfcmrvl: update device tree bindings for Marvell NFC") -Cc: stable # 4.2 -Cc: Vincent Cuissard -Cc: Samuel Ortiz -Signed-off-by: Johan Hovold -Signed-off-by: Rob Herring -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/nfc/nfcmrvl/uart.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/drivers/nfc/nfcmrvl/uart.c -+++ b/drivers/nfc/nfcmrvl/uart.c -@@ -73,10 +73,9 @@ static int nfcmrvl_uart_parse_dt(struct - struct device_node *matched_node; - int ret; - -- matched_node = of_find_compatible_node(node, NULL, "marvell,nfc-uart"); -+ matched_node = of_get_compatible_child(node, "marvell,nfc-uart"); - if (!matched_node) { -- matched_node = of_find_compatible_node(node, NULL, -- "mrvl,nfc-uart"); -+ matched_node = of_get_compatible_child(node, "mrvl,nfc-uart"); - if (!matched_node) - return -ENODEV; - } diff --git a/queue-4.4/series b/queue-4.4/series index 4f28d6d4754..616732f3f55 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -51,7 +51,6 @@ xen-fix-race-in-xen_qlock_wait.patch xen-make-xen_qlock_wait-nestable.patch net-ipv4-defensive-cipso-option-parsing.patch libnvdimm-hold-reference-on-parent-while-scheduling-async-init.patch -asoc-sta32x-set-component-pointer-in-private-struct.patch jbd2-fix-use-after-free-in-jbd2_log_do_checkpoint.patch gfs2_meta-mount-can-get-null-dev_name.patch ext4-initialize-retries-variable-in-ext4_da_write_inline_data_begin.patch @@ -71,7 +70,6 @@ smb3-do-not-attempt-cifs-operation-in-smb3-query-info-error-path.patch smb3-on-kerberos-mount-if-server-doesn-t-specify-auth-type-use-krb5.patch printk-fix-panic-caused-by-passing-log_buf_len-to-command-line.patch genirq-fix-race-on-spurious-interrupt-detection.patch -nfc-nfcmrvl_uart-fix-of-child-node-lookup.patch nfsv4.1-fix-the-r-wsize-checking.patch nfsd-fix-an-oops-in-free_session.patch lockd-fix-access-beyond-unterminated-strings-in-prints.patch -- 2.47.2