DigiGoon/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xen/xenbus: reference count registered modules

Browse source 
[ Upstream commit 196748a276b4dee01177e6b7abcda27cd759de83 ]

To prevent a PV driver module being removed whilst attached to its other
end, and hence xenbus calling into potentially invalid text, take a
reference on the module before calling the probe() method (dropping it if
unsuccessful) and drop the reference after returning from the remove()
method.

Suggested-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Stable-dep-of: afc545da381b ("xen: Fix the issue of resource not being properly released in xenbus_dev_probe()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Paul Durrant 2019-12-02 11:41:16 +00:00 • committed by Greg Kroah-Hartman
parent 98d62cf0e2
commit 892ad83f20
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/xen/xenbus/xenbus_probe.c
View file

@ -233,9 +233,16 @@ int xenbus_dev_probe(struct device *_dev)
return err; return err;
} }
if (!try_module_get(drv->driver.owner)) {
dev_warn(&dev->dev, "failed to acquire module reference on '%s'\n",
drv->driver.name);
err = -ESRCH;
goto fail;
}
err = drv->probe(dev, id); err = drv->probe(dev, id);
if (err) if (err)
goto fail; goto fail_put;
err = watch_otherend(dev); err = watch_otherend(dev);
if (err) { if (err) {
@ -245,6 +252,8 @@ int xenbus_dev_probe(struct device *_dev)
} }
return 0; return 0;
fail_put:
module_put(drv->driver.owner);
fail: fail:
xenbus_dev_error(dev, err, "xenbus_dev_probe on %s", dev->nodename); xenbus_dev_error(dev, err, "xenbus_dev_probe on %s", dev->nodename);
xenbus_switch_state(dev, XenbusStateClosed); xenbus_switch_state(dev, XenbusStateClosed);
@ -264,6 +273,8 @@ int xenbus_dev_remove(struct device *_dev)
if (drv->remove) if (drv->remove)
drv->remove(dev); drv->remove(dev);
module_put(drv->driver.owner);
free_otherend_details(dev); free_otherend_details(dev);
xenbus_switch_state(dev, XenbusStateClosed); xenbus_switch_state(dev, XenbusStateClosed);