qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 8/9] file-posix: Fix shared locks on reopen commit
Date: Mon, 19 Nov 2018 15:29:43 +0100	[thread overview]
Message-ID: <20181119142944.29061-9-kwolf@redhat.com> (raw)
In-Reply-To: <20181119142944.29061-1-kwolf@redhat.com>

From: Max Reitz <mreitz@redhat.com>

s->locked_shared_perm is the set of bits locked in the file, which is
the inverse of the permissions actually shared.  So we need to pass them
as they are to raw_apply_lock_bytes() instead of inverting them again.

Reported-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/file-posix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index 58c86a01ea..07bbdab953 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -959,7 +959,7 @@ static void raw_reopen_commit(BDRVReopenState *state)
 
     /* Copy locks to the new fd before closing the old one. */
     raw_apply_lock_bytes(NULL, rs->fd, s->locked_perm,
-                         ~s->locked_shared_perm, false, &local_err);
+                         s->locked_shared_perm, false, &local_err);
     if (local_err) {
         /* shouldn't fail in a sane host, but report it just in case. */
         error_report_err(local_err);
-- 
2.19.1

  parent reply	other threads:[~2018-11-19 14:30 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-19 14:29 [Qemu-devel] [PULL 0/9] Block layer patches Kevin Wolf
2018-11-19 14:29 ` [Qemu-devel] [PULL 1/9] nvme: fix oob access issue(CVE-2018-16847) Kevin Wolf
2018-11-19 14:29 ` [Qemu-devel] [PULL 2/9] fdc: fix segfault in fdctrl_stop_transfer() when DMA is disabled Kevin Wolf
2018-11-19 14:29 ` [Qemu-devel] [PULL 3/9] vvfat: Fix memory leak Kevin Wolf
2018-11-19 14:29 ` [Qemu-devel] [PULL 4/9] qcow2: Document some maximum size constraints Kevin Wolf
2018-11-19 14:29 ` [Qemu-devel] [PULL 5/9] qcow2: Don't allow overflow during cluster allocation Kevin Wolf
2018-11-19 14:29 ` [Qemu-devel] [PULL 6/9] iotests: Add new test 220 for max compressed cluster offset Kevin Wolf
2018-11-19 14:29 ` [Qemu-devel] [PULL 7/9] block: Always abort reopen after prepare succeeded Kevin Wolf
2018-11-19 14:29 ` Kevin Wolf [this message]
2018-11-19 14:29 ` [Qemu-devel] [PULL 9/9] iotests: Test file-posix locking and reopen Kevin Wolf
2018-11-19 15:03 ` [Qemu-devel] [PULL 0/9] Block layer patches Peter Maydell

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=20181119142944.29061-9-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.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).