Revert 341:424f7b772301d501af6952507b2731e4b8c6da0a

xenbus uevent environment handling code is very much alive.

diff --git a/drivers/xen/netback/xenbus.c b/drivers/xen/netback/xenbus.c
index 21069f61fc94840583c9984e4123f1ff0cc06965..4aa0c69731cae9977f76ca0ef62b97d33735327b 100644 (file)
--- a/drivers/xen/netback/xenbus.c
+++ b/drivers/xen/netback/xenbus.c
@@ -173,6 +173,8 @@ static int netback_uevent(struct xenbus_device *xdev, char **envp,
        add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
                       "vif=%s", netif->dev->name);
 
+       envp[i] = NULL;
+
        return 0;
 }
 

diff --git a/drivers/xen/xenbus/xenbus_probe_backend.c b/drivers/xen/xenbus/xenbus_probe_backend.c
index 75f2d9f9d1d222ef05f1dd1cf4a23f79be85b209..b8e768339c2cadb61574784af840241dc75533be 100644 (file)
--- a/drivers/xen/xenbus/xenbus_probe_backend.c
+++ b/drivers/xen/xenbus/xenbus_probe_backend.c
@@ -156,6 +156,13 @@ static int xenbus_uevent_backend(struct device *dev, char **envp,
        add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
                       "XENBUS_BASE_PATH=%s", xenbus_backend.root);
 
+       /* terminate, set to next free slot, shrink available space */
+       envp[i] = NULL;
+       envp = &envp[i];
+       num_envp -= i;
+       buffer = &buffer[length];
+       buffer_size -= length;
+
        if (dev->driver) {
                drv = to_xenbus_driver(dev->driver);
                if (drv && drv->uevent)