diff options
| author | Kunwu Chan <chentao@kylinos.cn> | 2024-01-18 11:37:59 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-13 12:50:15 +0200 |
| commit | 004402ec227732308871a6127f0b967cf2a293cd (patch) | |
| tree | d333568357be875608becde7ecc7f975a3a71b75 | |
| parent | ec2049fb2b8be3e108fe2ef1f1040f91e72c9990 (diff) | |
| download | linux-stable-004402ec227732308871a6127f0b967cf2a293cd.tar.gz linux-stable-004402ec227732308871a6127f0b967cf2a293cd.tar.bz2 linux-stable-004402ec227732308871a6127f0b967cf2a293cd.zip | |
Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails
[ 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>
| -rw-r--r-- | drivers/input/rmi4/rmi_driver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index ac6a20f7afdf..0da814b41e72 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -1199,7 +1199,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); |