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:51:38 +0200 |
| commit | e04cae532ad8d803ec876e01fc5c3568c4774ae2 (patch) | |
| tree | 4134d3bf15f20822b151cd9178275110c02124e2 | |
| parent | 68a69bb2ecafaacdb998a87783068fb51736f43b (diff) | |
| download | linux-e04cae532ad8d803ec876e01fc5c3568c4774ae2.tar.gz linux-e04cae532ad8d803ec876e01fc5c3568c4774ae2.tar.bz2 linux-e04cae532ad8d803ec876e01fc5c3568c4774ae2.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 258d5fe3d395..aa32371f04af 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); |