Commit 7acfd427 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.11-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from Juergen Gross:
 "Fixes for security issues just having been disclosed:

   - a five patch series for fixing of XSA-349 (DoS via resource
     depletion in Xen dom0)

   - a patch fixing XSA-350 (access of stale pointer in a Xen dom0)"

* tag 'for-linus-5.11-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen-blkback: set ring->xenblkd to NULL after kthread_stop()
  xenbus/xenbus_backend: Disallow pending watch messages
  xen/xenbus: Count pending messages for each watch
  xen/xenbus/xen_bus_type: Support will_handle watch callback
  xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path()
  xen/xenbus: Allow watches discard events before queueing
parents 571b12dd 1c728719

drivers/block/xen-blkback/xenbus.c

+3 −1
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif) 


		if (ring->xenblkd) {

			kthread_stop(ring->xenblkd);

			ring->xenblkd = NULL;

			wake_up(&ring->shutdown_wq);

		}
@@ -675,7 +676,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

+5 −1
Original line number Diff line number Diff line
@@ -557,12 +557,14 @@ static int xen_register_credit_watch(struct xenbus_device *dev, 
		return -ENOMEM;

	snprintf(node, maxlen, "%s/rate", dev->nodename);

	vif->credit_watch.node = node;

	vif->credit_watch.will_handle = NULL;

	vif->credit_watch.callback = xen_net_rate_changed;

	err = register_xenbus_watch(&vif->credit_watch);

	if (err) {

		pr_err("Failed to set watcher %s\n", vif->credit_watch.node);

		kfree(node);

		vif->credit_watch.node = NULL;

		vif->credit_watch.will_handle = NULL;

		vif->credit_watch.callback = NULL;

	}

	return err;
@@ -609,6 +611,7 @@ static int xen_register_mcast_ctrl_watch(struct xenbus_device *dev, 
	snprintf(node, maxlen, "%s/request-multicast-control",

		 dev->otherend);

	vif->mcast_ctrl_watch.node = node;

	vif->mcast_ctrl_watch.will_handle = NULL;

	vif->mcast_ctrl_watch.callback = xen_mcast_ctrl_changed;

	err = register_xenbus_watch(&vif->mcast_ctrl_watch);

	if (err) {
@@ -616,6 +619,7 @@ static int xen_register_mcast_ctrl_watch(struct xenbus_device *dev, 
		       vif->mcast_ctrl_watch.node);

		kfree(node);

		vif->mcast_ctrl_watch.node = NULL;

		vif->mcast_ctrl_watch.will_handle = NULL;

		vif->mcast_ctrl_watch.callback = NULL;

	}

	return err;
@@ -820,7 +824,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
@@ -689,7 +689,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.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ struct xen_bus_type { 
	int (*get_bus_id)(char bus_id[XEN_BUS_ID_SIZE], const char *nodename);

	int (*probe)(struct xen_bus_type *bus, const char *type,

		     const char *dir);

	bool (*otherend_will_handle)(struct xenbus_watch *watch,

				     const char *path, const char *token);

	void (*otherend_changed)(struct xenbus_watch *watch, const char *path,

				 const char *token);

	struct bus_type bus;

drivers/xen/xenbus/xenbus_client.c

+7 −1
Original line number Diff line number Diff line
@@ -127,18 +127,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 = 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);

	}
@@ -165,6 +169,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, ...)
@@ -181,7 +187,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE