From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Kunwu Chan <chentao@kylinos.cn>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Sasha Levin <sashal@kernel.org>,
minipli@grsecurity.net, linux-input@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 01/23] Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails
Date: Fri, 29 Mar 2024 08:49:34 -0400 [thread overview]
Message-ID: <20240329125009.3093845-1-sashal@kernel.org> (raw)
From: Kunwu Chan <chentao@kylinos.cn>
[ Upstream commit bc4996184d56cfaf56d3811ac2680c8a0e2af56e ]
While input core can work with input->phys set to NULL userspace might
depend on it, so better fail probing if allocation fails. The system must
be in a pretty bad shape for it to happen anyway.
Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
Link: https://lore.kernel.org/r/20240117073124.143636-1-chentao@kylinos.cn
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/input/rmi4/rmi_driver.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index 258d5fe3d395c..aa32371f04af6 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -1196,7 +1196,11 @@ static int rmi_driver_probe(struct device *dev)
}
rmi_driver_set_input_params(rmi_dev, data->input);
data->input->phys = devm_kasprintf(dev, GFP_KERNEL,
- "%s/input0", dev_name(dev));
+ "%s/input0", dev_name(dev));
+ if (!data->input->phys) {
+ retval = -ENOMEM;
+ goto err;
+ }
}
retval = rmi_init_functions(data);
--
2.43.0
next reply other threads:[~2024-03-29 12:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 12:49 Sasha Levin [this message]
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 02/23] VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host() Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 03/23] sysv: don't call sb_bread() with pointers_lock held Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 04/23] quota: Fix potential NULL pointer dereference Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 05/23] scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc() Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 06/23] panic: Flush kernel log buffer at the end Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 07/23] isofs: handle CDs with bad root inode but good Joliet root directory Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 08/23] arm64: dts: rockchip: fix rk3328 hdmi ports node Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 09/23] arm64: dts: rockchip: fix rk3399 " Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 10/23] media: sta2x11: fix irq handler cast Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 11/23] drm/amd/display: Fix nanosec stat overflow Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 12/23] tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num() Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 13/23] SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 14/23] Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default" Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 15/23] sparc: vdso: Disable UBSAN instrumentation Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 16/23] PCI: Mark LSI FW643 to avoid bus reset Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 17/23] sh: Fix build with CONFIG_UBSAN=y Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 18/23] btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks() Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 19/23] btrfs: export: handle invalid inode or root reference in btrfs_get_parent() Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 20/23] btrfs: send: handle path ref underflow in header iterate_inode_ref() Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 21/23] block: prevent division by zero in blk_rq_stat_sum() Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 22/23] Input: allocate keycode for Display refresh rate toggle Sasha Levin
2024-03-29 12:49 ` [PATCH AUTOSEL 5.4 23/23] ktest: force $buildonly = 1 for 'make_warnings_file' test type Sasha Levin
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=20240329125009.3093845-1-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=chentao@kylinos.cn \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=minipli@grsecurity.net \
--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