diff options
| author | Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> | 2015-06-26 03:28:24 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-09-03 13:30:02 +0100 |
| commit | f27f75ca7aab35143daf6ab708eefef37a119c0b (patch) | |
| tree | 514a02fea535fb7d9e3dd41f5a05c5dcb640ef48 | |
| parent | 00c115f19e9ede03d3a543811deb96bc97285ea4 (diff) | |
| download | linux-stable-f27f75ca7aab35143daf6ab708eefef37a119c0b.tar.gz linux-stable-f27f75ca7aab35143daf6ab708eefef37a119c0b.tar.bz2 linux-stable-f27f75ca7aab35143daf6ab708eefef37a119c0b.zip | |
xen/gntdevt: Fix race condition in gntdev_release()
commit 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 upstream.
While gntdev_release() is called the MMU notifier is still registered
and can traverse priv->maps list even if no pages are mapped (which is
the case -- gntdev_release() is called after all). But
gntdev_release() will clear that list, so make sure that only one of
those things happens at the same time.
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/xen/gntdev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index b7f028a8f542..91cc44611062 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -529,12 +529,14 @@ static int gntdev_release(struct inode *inode, struct file *flip) pr_debug("priv %p\n", priv); + mutex_lock(&priv->lock); while (!list_empty(&priv->maps)) { map = list_entry(priv->maps.next, struct grant_map, next); list_del(&map->next); gntdev_put_map(NULL /* already removed */, map); } WARN_ON(!list_empty(&priv->freeable_maps)); + mutex_unlock(&priv->lock); if (use_ptemod) mmu_notifier_unregister(&priv->mn, priv->mm); |