diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2016-12-09 15:41:13 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2016-12-12 15:22:13 +0100 |
| commit | 581d21a2d02a798ee34e56dbfa13f891b3a90c30 (patch) | |
| tree | 332071831cfcfdf54c1db18a874d0e687326d11a | |
| parent | xen/scsifront: don't request a slot on the ring until request is ready (diff) | |
| download | linux-581d21a2d02a798ee34e56dbfa13f891b3a90c30.tar.xz linux-581d21a2d02a798ee34e56dbfa13f891b3a90c30.zip | |
xenbus: fix deadlock on writes to /proc/xen/xenbus
/proc/xen/xenbus does not work correctly. A read blocked waiting for
a xenstore message holds the mutex needed for atomic file position
updates. This blocks any writes on the same file handle, which can
deadlock if the write is needed to unblock the read.
Clear FMODE_ATOMIC_POS when opening this device to always get
character device like sematics.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
| -rw-r--r-- | drivers/xen/xenbus/xenbus_dev_frontend.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c index 1e8be12ebb55..6c0ead4be784 100644 --- a/drivers/xen/xenbus/xenbus_dev_frontend.c +++ b/drivers/xen/xenbus/xenbus_dev_frontend.c @@ -538,6 +538,8 @@ static int xenbus_file_open(struct inode *inode, struct file *filp) nonseekable_open(inode, filp); + filp->f_mode &= ~FMODE_ATOMIC_POS; /* cdev-style semantics */ + u = kzalloc(sizeof(*u), GFP_KERNEL); if (u == NULL) return -ENOMEM; |