From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org
Cc: "Juergen Gross" <jgross@suse.com>,
"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Marek Marczykowski-Górecki" <marmarek@invisiblethingslab.com>,
stable@vger.kernel.org
Subject: [PATCH] xen/events: avoid NULL pointer dereference in evtchn_from_irq()
Date: Thu, 19 Mar 2020 08:14:28 +0100 [thread overview]
Message-ID: <20200319071428.12115-1-jgross@suse.com> (raw)
There have been reports of races in evtchn_from_irq() where the info
pointer has been NULL.
Avoid that case by testing info before dereferencing it.
In order to avoid accessing a just freed info structure do the kfree()
via kfree_rcu().
Cc: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Cc: stable@vger.kernel.org
Reported-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
---
drivers/xen/events/events_base.c | 10 ++++++++--
drivers/xen/events/events_internal.h | 3 +++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 499eff7d3f65..838762fe3d6e 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -247,10 +247,16 @@ static void xen_irq_info_cleanup(struct irq_info *info)
*/
unsigned int evtchn_from_irq(unsigned irq)
{
+ struct irq_info *info;
+
if (WARN(irq >= nr_irqs, "Invalid irq %d!\n", irq))
return 0;
- return info_for_irq(irq)->evtchn;
+ info = info_for_irq(irq);
+ if (info == NULL)
+ return 0;
+
+ return info->evtchn;
}
unsigned irq_from_evtchn(unsigned int evtchn)
@@ -436,7 +442,7 @@ static void xen_free_irq(unsigned irq)
WARN_ON(info->refcnt > 0);
- kfree(info);
+ kfree_rcu(info, rcu);
/* Legacy IRQ descriptors are managed by the arch. */
if (irq < nr_legacy_irqs())
diff --git a/drivers/xen/events/events_internal.h b/drivers/xen/events/events_internal.h
index 82938cff6c7a..c421055843c8 100644
--- a/drivers/xen/events/events_internal.h
+++ b/drivers/xen/events/events_internal.h
@@ -7,6 +7,8 @@
#ifndef __EVENTS_INTERNAL_H__
#define __EVENTS_INTERNAL_H__
+#include <linux/rcupdate.h>
+
/* Interrupt types. */
enum xen_irq_type {
IRQT_UNBOUND = 0,
@@ -30,6 +32,7 @@ enum xen_irq_type {
*/
struct irq_info {
struct list_head list;
+ struct rcu_head rcu;
int refcnt;
enum xen_irq_type type; /* type */
unsigned irq;
--
2.16.4
next reply other threads:[~2020-03-19 7:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-19 7:14 Juergen Gross [this message]
2020-03-19 16:01 ` [PATCH] xen/events: avoid NULL pointer dereference in evtchn_from_irq() Boris Ostrovsky
2020-05-21 17:22 ` Boris Ostrovsky
2020-05-21 18:46 ` Marek Marczykowski-Górecki
2020-05-21 21:57 ` Boris Ostrovsky
2020-05-22 8:18 ` Jürgen Groß
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=20200319071428.12115-1-jgross@suse.com \
--to=jgross@suse.com \
--cc=boris.ostrovsky@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marmarek@invisiblethingslab.com \
--cc=sstabellini@kernel.org \
--cc=stable@vger.kernel.org \
--cc=xen-devel@lists.xenproject.org \
/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;
as well as URLs for NNTP newsgroup(s).