diff options
| author | Wei Liu <wei.liu2@citrix.com> | 2013-02-18 14:57:58 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-03-06 03:24:07 +0000 |
| commit | c03cebd18980114fd931e30dbaf05c5982268ea4 (patch) | |
| tree | ada8ecd068ff94a69a6d692e941efb0db5a10f0c /drivers/xen | |
| parent | cf65e1c8b3974df5bbf5b7cfbebbd125485d3a48 (diff) | |
| download | kernel_samsung_smdk4412-c03cebd18980114fd931e30dbaf05c5982268ea4.zip kernel_samsung_smdk4412-c03cebd18980114fd931e30dbaf05c5982268ea4.tar.gz kernel_samsung_smdk4412-c03cebd18980114fd931e30dbaf05c5982268ea4.tar.bz2 | |
xen: close evtchn port if binding to irq fails
commit e7e44e444876478d50630f57b0c31d29f6725020 upstream.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/xen')
| -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 dbc13e9..c93d59e 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 = 0; + 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); |