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

Commit 3a36e4af authored by SeongJae Park's avatar SeongJae Park Committed by Greg Kroah-Hartman
Browse files

xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path() 



commit 2e85d32b1c865bec703ce0c962221a5e955c52c2 upstream.

Some code does not directly make 'xenbus_watch' object and call
'register_xenbus_watch()' but use 'xenbus_watch_path()' instead.  This
commit adds support of 'will_handle' callback in the
'xenbus_watch_path()' and it's wrapper, 'xenbus_watch_pathfmt()'.

This is part of XSA-349

Cc: stable@vger.kernel.org
Signed-off-by: default avatarSeongJae Park <sjpark@amazon.de>
Reported-by: default avatarMichael Kurth <mku@amazon.de>
Reported-by: default avatarPawel Wieczorkiewicz <wipawel@amazon.de>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9039eb22

drivers/block/xen-blkback/xenbus.c

+2 −1
Original line number Diff line number Diff line
@@ -652,7 +652,8 @@ static int xen_blkbk_probe(struct xenbus_device *dev, 
	/* setup back pointer */

	be->blkif->be = be;



	err = xenbus_watch_pathfmt(dev, &be->backend_watch, backend_changed,

	err = xenbus_watch_pathfmt(dev, &be->backend_watch, NULL,

				   backend_changed,

				   "%s/%s", dev->nodename, "physical-device");

	if (err)

		goto fail;

drivers/net/xen-netback/xenbus.c

+1 −1
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ static void connect(struct backend_info *be) 
	xenvif_carrier_on(be->vif);



	unregister_hotplug_status_watch(be);

	err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch,

	err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch, NULL,

				   hotplug_status_changed,

				   "%s/%s", dev->nodename, "hotplug-status");

	if (!err)

drivers/xen/xen-pciback/xenbus.c

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ static int xen_pcibk_xenbus_probe(struct xenbus_device *dev, 


	/* watch the backend node for backend configuration information */

	err = xenbus_watch_path(dev, dev->nodename, &pdev->be_watch,

				xen_pcibk_be_watch);

				NULL, xen_pcibk_be_watch);

	if (err)

		goto out;

drivers/xen/xenbus/xenbus_client.c

+7 −2
Original line number Diff line number Diff line
@@ -114,19 +114,22 @@ EXPORT_SYMBOL_GPL(xenbus_strstate); 
 */

int xenbus_watch_path(struct xenbus_device *dev, const char *path,

		      struct xenbus_watch *watch,

		      bool (*will_handle)(struct xenbus_watch *,

					  const char *, const char *),

		      void (*callback)(struct xenbus_watch *,

				       const char *, const char *))

{

	int err;



	watch->node = path;

	watch->will_handle = NULL;

	watch->will_handle = will_handle;

	watch->callback = callback;



	err = register_xenbus_watch(watch);



	if (err) {

		watch->node = NULL;

		watch->will_handle = NULL;

		watch->callback = NULL;

		xenbus_dev_fatal(dev, err, "adding watch on %s", path);

	}
@@ -153,6 +156,8 @@ EXPORT_SYMBOL_GPL(xenbus_watch_path); 
 */

int xenbus_watch_pathfmt(struct xenbus_device *dev,

			 struct xenbus_watch *watch,

			 bool (*will_handle)(struct xenbus_watch *,

					const char *, const char *),

			 void (*callback)(struct xenbus_watch *,

					  const char *, const char *),

			 const char *pathfmt, ...)
@@ -169,7 +174,7 @@ int xenbus_watch_pathfmt(struct xenbus_device *dev, 
		xenbus_dev_fatal(dev, -ENOMEM, "allocating path for watch");

		return -ENOMEM;

	}

	err = xenbus_watch_path(dev, path, watch, callback);

	err = xenbus_watch_path(dev, path, watch, will_handle, callback);



	if (err)

		kfree(path);

drivers/xen/xenbus/xenbus_probe.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int watch_otherend(struct xenbus_device *dev) 
		container_of(dev->dev.bus, struct xen_bus_type, bus);



	return xenbus_watch_pathfmt(dev, &dev->otherend_watch,

				    bus->otherend_changed,

				    NULL, bus->otherend_changed,

				    "%s/%s", dev->otherend, "state");

}