serdev: fix registration of second slave (08fcee28) · Commits · 戴 / test

Serdev currently only supports a single slave device, but the required sanity checks to prevent further registration attempts were missing. If a serial-port node has two child nodes with compatible properties, the OF code would try to register two slave devices using the same id and name. Driver core will not allow this (and there will be loud complaints), but the controller's slave pointer would already have been set to address of the soon to be deallocated second struct serdev_device. As the first slave device remains registered, this can lead to later use-after-free issues when the slave callbacks are accessed. Note that while the serdev registration helpers are exported, they are typically only called by serdev core. Any other (out-of-tree) callers must serialise registration and deregistration themselves. Fixes: ("serdev: Introduce new bus for serial attached devices") Cc: stable <stable@vger.kernel.org> # 4.11 Cc: Rob Herring <robh@kernel.org> Signed-off-by:

Johan Hovold <johan@kernel.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/tty/serdev/core.c

+16 −3

Original line number	Diff line number	Diff line
		@@ -75,21 +75,32 @@ static int serdev_uevent(struct device dev, struct kobj_uevent_env env)
		*/
		int serdev_device_add(struct serdev_device *serdev)
		{
		struct serdev_controller *ctrl = serdev->ctrl;
		struct device *parent = serdev->dev.parent;
		int err;

		dev_set_name(&serdev->dev, "%s-%d", dev_name(parent), serdev->nr);

		/* Only a single slave device is currently supported. */
		if (ctrl->serdev) {
		dev_err(&serdev->dev, "controller busy\n");
		return -EBUSY;
		}
		ctrl->serdev = serdev;

		err = device_add(&serdev->dev);
		if (err < 0) {
		dev_err(&serdev->dev, "Can't add %s, status %d\n",
		dev_name(&serdev->dev), err);
		goto err_device_add;
		goto err_clear_serdev;
		}

		dev_dbg(&serdev->dev, "device %s registered\n", dev_name(&serdev->dev));

		err_device_add:
		return 0;

		err_clear_serdev:
		ctrl->serdev = NULL;
		return err;
		}
		EXPORT_SYMBOL_GPL(serdev_device_add);
		@@ -100,7 +111,10 @@ EXPORT_SYMBOL_GPL(serdev_device_add);
		*/
		void serdev_device_remove(struct serdev_device *serdev)
		{
		struct serdev_controller *ctrl = serdev->ctrl;

		device_unregister(&serdev->dev);
		ctrl->serdev = NULL;
		}
		EXPORT_SYMBOL_GPL(serdev_device_remove);

		@@ -311,7 +325,6 @@ struct serdev_device serdev_device_alloc(struct serdev_controller ctrl)
		return NULL;

		serdev->ctrl = ctrl;
		ctrl->serdev = serdev;
		device_initialize(&serdev->dev);
		serdev->dev.parent = &ctrl->dev;
		serdev->dev.bus = &serdev_bus_type;

Admin message