Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 004402ec authored by Kunwu Chan's avatar Kunwu Chan Committed by Greg Kroah-Hartman
Browse files

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: default avatarKunwu Chan <chentao@kylinos.cn>
Link: https://lore.kernel.org/r/20240117073124.143636-1-chentao@kylinos.cn


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ec2049fb

drivers/input/rmi4/rmi_driver.c

+5 −1
Original line number Diff line number Diff line
@@ -1200,6 +1200,10 @@ 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));

		if (!data->input->phys) {

			retval = -ENOMEM;

			goto err;

		}

	}



	retval = rmi_init_functions(data);