From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Johan Hovold <johan@kernel.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: [PATCH 4.4 34/53] Input: 88pm860x-ts - fix child-node lookup
Date: Mon, 22 Jan 2018 09:40:26 +0100 [thread overview]
Message-ID: <20180122083911.821207740@linuxfoundation.org> (raw)
In-Reply-To: <20180122083910.299610926@linuxfoundation.org>
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <johan@kernel.org>
commit 906bf7daa0618d0ef39f4872ca42218c29a3631f upstream.
Fix child node-lookup during probe, which ended up searching the whole
device tree depth-first starting at parent rather than just matching on
its children.
To make things worse, the parent node was prematurely freed, while the
child node was leaked.
Fixes: 2e57d56747e6 ("mfd: 88pm860x: Device tree support")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/input/touchscreen/88pm860x-ts.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
--- a/drivers/input/touchscreen/88pm860x-ts.c
+++ b/drivers/input/touchscreen/88pm860x-ts.c
@@ -126,7 +126,7 @@ static int pm860x_touch_dt_init(struct p
int data, n, ret;
if (!np)
return -ENODEV;
- np = of_find_node_by_name(np, "touch");
+ np = of_get_child_by_name(np, "touch");
if (!np) {
dev_err(&pdev->dev, "Can't find touch node\n");
return -EINVAL;
@@ -144,13 +144,13 @@ static int pm860x_touch_dt_init(struct p
if (data) {
ret = pm860x_reg_write(i2c, PM8607_GPADC_MISC1, data);
if (ret < 0)
- return -EINVAL;
+ goto err_put_node;
}
/* set tsi prebias time */
if (!of_property_read_u32(np, "marvell,88pm860x-tsi-prebias", &data)) {
ret = pm860x_reg_write(i2c, PM8607_TSI_PREBIAS, data);
if (ret < 0)
- return -EINVAL;
+ goto err_put_node;
}
/* set prebias & prechg time of pen detect */
data = 0;
@@ -161,10 +161,18 @@ static int pm860x_touch_dt_init(struct p
if (data) {
ret = pm860x_reg_write(i2c, PM8607_PD_PREBIAS, data);
if (ret < 0)
- return -EINVAL;
+ goto err_put_node;
}
of_property_read_u32(np, "marvell,88pm860x-resistor-X", res_x);
+
+ of_node_put(np);
+
return 0;
+
+err_put_node:
+ of_node_put(np);
+
+ return -EINVAL;
}
#else
#define pm860x_touch_dt_init(x, y, z) (-1)
next prev parent reply other threads:[~2018-01-22 8:43 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 8:39 [PATCH 4.4 00/53] 4.4.113-stable review Greg Kroah-Hartman
2018-01-22 8:39 ` [PATCH 4.4 01/53] gcov: disable for COMPILE_TEST Greg Kroah-Hartman
2018-01-22 8:39 ` [PATCH 4.4 02/53] x86/cpu/AMD: Make LFENCE a serializing instruction Greg Kroah-Hartman
2018-01-22 8:39 ` [PATCH 4.4 03/53] x86/cpu/AMD: Use LFENCE_RDTSC in preference to MFENCE_RDTSC Greg Kroah-Hartman
2018-01-22 8:39 ` [PATCH 4.4 04/53] x86/mm/32: Move setup_clear_cpu_cap(X86_FEATURE_PCID) earlier Greg Kroah-Hartman
2018-01-22 8:39 ` [PATCH 4.4 05/53] x86/asm: Use register variable to get stack pointer value Greg Kroah-Hartman
2018-02-06 21:59 ` Matthias Kaehlcke
2018-02-06 22:37 ` Greg Kroah-Hartman
2018-02-06 22:48 ` Matthias Kaehlcke
2018-02-06 22:52 ` Greg Kroah-Hartman
2018-01-22 8:39 ` [PATCH 4.4 06/53] x86/kbuild: enable modversions for symbols exported from asm Greg Kroah-Hartman
2018-01-22 8:39 ` [PATCH 4.4 07/53] x86/asm: Make asm/alternative.h safe from assembly Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 08/53] EXPORT_SYMBOL() for asm Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 09/53] kconfig.h: use __is_defined() to check if MODULE is defined Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 10/53] x86/retpoline: Add initial retpoline support Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 11/53] x86/spectre: Add boot time option to select Spectre v2 mitigation Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 12/53] x86/retpoline/crypto: Convert crypto assembler indirect jumps Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 13/53] x86/retpoline/entry: Convert entry " Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 14/53] x86/retpoline/ftrace: Convert ftrace " Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 15/53] x86/retpoline/hyperv: Convert " Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 16/53] x86/retpoline/xen: Convert Xen hypercall " Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 17/53] x86/retpoline/checksum32: Convert assembler " Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 18/53] x86/retpoline/irq32: " Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 19/53] x86/retpoline: Fill return stack buffer on vmexit Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 20/53] x86/retpoline: Remove compile time warning Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 21/53] scsi: sg: disable SET_FORCE_LOW_DMA Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 22/53] futex: Prevent overflow by strengthen input validation Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 23/53] ALSA: pcm: Remove yet superfluous WARN_ON() Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 24/53] ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 25/53] ALSA: hda - Apply the existing quirk to iMac 14,1 Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 26/53] af_key: fix buffer overread in verify_address_len() Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 27/53] af_key: fix buffer overread in parse_exthdrs() Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 28/53] scsi: hpsa: fix volume offline state Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 29/53] sched/deadline: Zero out positive runtime after throttling constrained tasks Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 30/53] x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 31/53] module: Add retpoline tag to VERMAGIC Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 32/53] pipe: avoid round_pipe_size() nr_pages overflow on 32-bit Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 33/53] x86/apic/vector: Fix off by one in error path Greg Kroah-Hartman
2018-02-16 20:57 ` Ben Hutchings
2018-02-17 13:34 ` Thomas Gleixner
2018-02-28 16:49 ` Thomas Gleixner
2018-01-22 8:40 ` Greg Kroah-Hartman [this message]
2018-01-22 8:40 ` [PATCH 4.4 35/53] Input: twl6040-vibra - fix DT node memory management Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 36/53] Input: twl6040-vibra - fix child-node lookup Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 37/53] Input: twl4030-vibra - fix sibling-node lookup Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 38/53] tracing: Fix converting enums from the map in trace_event_eval_update() Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 39/53] phy: work around phys references to usb-nop-xceiv devices Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 40/53] ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7 Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 41/53] can: peak: fix potential bug in packet fragmentation Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 42/53] libata: apply MAX_SEC_1024 to all LITEON EP1 series devices Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 43/53] dm btree: fix serious bug in btree_split_beneath() Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 44/53] dm thin metadata: THIN_MAX_CONCURRENT_LOCKS should be 6 Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 45/53] arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 46/53] x86/cpu, x86/pti: Do not enable PTI on AMD processors Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 47/53] kbuild: modversions for EXPORT_SYMBOL() for asm Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 48/53] x86/mce: Make machine check speculation protected Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 49/53] retpoline: Introduce start/end markers of indirect thunk Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 50/53] kprobes/x86: Blacklist indirect thunk functions for kprobes Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 51/53] kprobes/x86: Disable optimizing on the function jumps to indirect thunk Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 52/53] x86/pti: Document fix wrong index Greg Kroah-Hartman
2018-01-22 8:40 ` [PATCH 4.4 53/53] x86/retpoline: Optimize inline assembler for vmexit_fill_RSB Greg Kroah-Hartman
2018-01-22 13:09 ` [PATCH 4.4 00/53] 4.4.113-stable review Nathan Chancellor
2018-01-22 14:20 ` Greg Kroah-Hartman
2018-01-22 19:08 ` Guenter Roeck
2018-01-22 19:49 ` Naresh Kamboju
2018-01-23 6:39 ` Greg Kroah-Hartman
2018-01-23 6:55 ` Sumit Semwal
2018-01-22 20:07 ` Shuah Khan
2018-01-23 6:37 ` Greg Kroah-Hartman
2018-01-22 23:48 ` kernelci.org bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180122083911.821207740@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=dmitry.torokhov@gmail.com \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).