diff options
| author | delphij <delphij@FreeBSD.org> | 2017-04-12 06:24:35 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2017-04-12 06:24:35 +0000 |
| commit | b8126de23e957978b4d0403097cd8402f0c1d82a (patch) | |
| tree | f1de81f49e9bed94c537e2b96701aa1180fa111c /sys/xen/xenbus | |
| parent | 8ec5a888ff17420a447fce1d15a0413c122dd297 (diff) | |
| download | FreeBSD-src-b8126de23e957978b4d0403097cd8402f0c1d82a.zip FreeBSD-src-b8126de23e957978b4d0403097cd8402f0c1d82a.tar.gz | |
Fix multiple vulnerabilities of ntp. [SA-17:03]
Xen migration enhancements. [EN-17:05]
Approved by: so
Diffstat (limited to 'sys/xen/xenbus')
| -rw-r--r-- | sys/xen/xenbus/xenbusb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/xen/xenbus/xenbusb.c b/sys/xen/xenbus/xenbusb.c index cf0d673..a8dbe01 100644 --- a/sys/xen/xenbus/xenbusb.c +++ b/sys/xen/xenbus/xenbusb.c @@ -791,6 +791,11 @@ xenbusb_resume(device_t dev) if (device_get_state(kids[i]) == DS_NOTPRESENT) continue; + if (xen_suspend_cancelled) { + DEVICE_RESUME(kids[i]); + continue; + } + ivars = device_get_ivars(kids[i]); xs_unregister_watch(&ivars->xd_otherend_watch); |
