diff options
| author | Wei Liu <wei.liu2@citrix.com> | 2013-02-18 15:57:58 +0100 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-02-20 04:02:33 +0100 |
| commit | e7e44e444876478d50630f57b0c31d29f6725020 (patch) | |
| tree | 8b99f3a80c5ceaba647c5b64f59b0a1b5d5927d7 /drivers | |
| parent | xen-evtchn: correct comment and error output (diff) | |
| download | linux-e7e44e444876478d50630f57b0c31d29f6725020.tar.xz linux-e7e44e444876478d50630f57b0c31d29f6725020.zip | |
xen: close evtchn port if binding to irq fails
CC: stable@vger.kernel.org
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/evtchn.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c index 4ebd501f1f80..45c8efaa6b3e 100644 --- a/drivers/xen/evtchn.c +++ b/drivers/xen/evtchn.c @@ -269,6 +269,14 @@ static int evtchn_bind_to_user(struct per_user_data *u, int port) u->name, (void *)(unsigned long)port); if (rc >= 0) rc = evtchn_make_refcounted(port); + else { + /* bind failed, should close the port now */ + struct evtchn_close close; + close.port = port; + if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0) + BUG(); + set_port_user(port, NULL); + } return rc; } @@ -277,6 +285,8 @@ static void evtchn_unbind_from_user(struct per_user_data *u, int port) { int irq = irq_from_evtchn(port); + BUG_ON(irq < 0); + unbind_from_irqhandler(irq, (void *)(unsigned long)port); set_port_user(port, NULL); |