projects
/
wrapfs-5.15.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
006936e
)
Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails
author
Kunwu Chan
<chentao@kylinos.cn>
Thu, 18 Jan 2024 19:37:59 +0000
(11:37 -0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sat, 13 Apr 2024 11:01:44 +0000
(13:01 +0200)
[ 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
patch
|
blob
|
history
diff --git
a/drivers/input/rmi4/rmi_driver.c
b/drivers/input/rmi4/rmi_driver.c
index 258d5fe3d395c4670088aa0d736cac69c7d24550..aa32371f04af6c8838efa1e9cb3ab1e8a3100dc6 100644
(file)
--- 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);