From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: stefano.stabellini@eu.citrix.com, linux-kernel@vger.kernel.org,
xen-devel@lists.xensource.com
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH 4/9] xen/events: Check that IRQ value passed in is valid.
Date: Tue, 16 Apr 2013 16:09:02 -0400 [thread overview]
Message-ID: <1366142947-18655-5-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1366142947-18655-1-git-send-email-konrad.wilk@oracle.com>
We naively assume that the IRQ value passed in is correct.
If it is not, then any dereference operation for the 'info'
structure will result in crash - so might as well guard ourselves
and sprinkle copious amounts of WARN_ON.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
drivers/xen/events.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index bb65f75..94daed1 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -515,6 +515,9 @@ static void xen_free_irq(unsigned irq)
{
struct irq_info *info = irq_get_handler_data(irq);
+ if (WARN_ON(!info))
+ return;
+
list_del(&info->list);
irq_set_handler_data(irq, NULL);
@@ -1003,6 +1006,9 @@ static void unbind_from_irq(unsigned int irq)
int evtchn = evtchn_from_irq(irq);
struct irq_info *info = irq_get_handler_data(irq);
+ if (WARN_ON(!info))
+ return;
+
mutex_lock(&irq_mapping_update_lock);
if (info->refcnt > 0) {
@@ -1130,6 +1136,10 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
void unbind_from_irqhandler(unsigned int irq, void *dev_id)
{
+ struct irq_info *info = irq_get_handler_data(irq);
+
+ if (WARN_ON(!info))
+ return;
free_irq(irq, dev_id);
unbind_from_irq(irq);
}
@@ -1441,6 +1451,9 @@ void rebind_evtchn_irq(int evtchn, int irq)
{
struct irq_info *info = info_for_irq(irq);
+ if (WARN_ON(!info))
+ return;
+
/* Make sure the irq is masked, since the new event channel
will also be masked. */
disable_irq(irq);
@@ -1714,7 +1727,12 @@ void xen_poll_irq(int irq)
int xen_test_irq_shared(int irq)
{
struct irq_info *info = info_for_irq(irq);
- struct physdev_irq_status_query irq_status = { .irq = info->u.pirq.pirq };
+ struct physdev_irq_status_query irq_status;
+
+ if (WARN_ON(!info))
+ return -ENOENT;
+
+ irq_status.irq = info->u.pirq.pirq;
if (HYPERVISOR_physdev_op(PHYSDEVOP_irq_status_query, &irq_status))
return 0;
--
1.8.1.4
next prev parent reply other threads:[~2013-04-16 20:11 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-16 20:08 [PATCH] fixes for v3.10 in the CPU hotplug patch (v1) Konrad Rzeszutek Wilk
2013-04-16 20:08 ` [PATCH 1/9] xen/smp: Fix leakage of timer interrupt line for every CPU online/offline Konrad Rzeszutek Wilk
2013-04-26 16:06 ` Stefano Stabellini
2013-04-16 20:09 ` [PATCH 2/9] xen/smp/spinlock: Fix leakage of the spinlock " Konrad Rzeszutek Wilk
2013-04-26 16:06 ` Stefano Stabellini
2013-04-16 20:09 ` [PATCH 3/9] xen/time: Fix kasprintf splat when allocating timer%d IRQ line Konrad Rzeszutek Wilk
2013-04-26 16:11 ` Stefano Stabellini
2013-04-29 18:36 ` Konrad Rzeszutek Wilk
2013-04-16 20:09 ` Konrad Rzeszutek Wilk [this message]
2013-04-26 16:12 ` [PATCH 4/9] xen/events: Check that IRQ value passed in is valid Stefano Stabellini
2013-04-16 20:09 ` [PATCH 5/9] xen/time: Add default value of -1 for IRQ and check for that Konrad Rzeszutek Wilk
2013-04-26 16:15 ` Stefano Stabellini
2013-04-16 20:09 ` [PATCH 6/9] xen/spinlock: Check against default value of -1 for IRQ line Konrad Rzeszutek Wilk
2013-04-26 16:18 ` Stefano Stabellini
2013-04-29 18:35 ` Konrad Rzeszutek Wilk
2013-04-16 20:09 ` [PATCH 7/9] xen/spinlock: Disable IRQ spinlock (PV) allocation on PVHVM Konrad Rzeszutek Wilk
2013-04-26 16:20 ` Stefano Stabellini
2013-04-29 18:34 ` Konrad Rzeszutek Wilk
2013-04-16 20:09 ` [PATCH 8/9] xen/smp/pvhvm: Don't initialize IRQ_WORKER as we are using the native one Konrad Rzeszutek Wilk
2013-04-26 16:27 ` Stefano Stabellini
2013-04-29 18:34 ` Konrad Rzeszutek Wilk
2013-05-01 13:25 ` Stefano Stabellini
2013-05-01 14:57 ` Konrad Rzeszutek Wilk
2013-05-01 15:07 ` Stefano Stabellini
2013-04-16 20:09 ` [PATCH 9/9] xen/smp: Unifiy some of the PVs and PVHVM offline CPU path Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366142947-18655-5-git-send-email-konrad.wilk@oracle.com \
--to=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®