Commit d815efca authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

file-posix: Fix creation locking 



raw_apply_lock_bytes() takes a bit mask of "permissions that are NOT
shared".

Also, make the "perm" and "shared" variables uint64_t, because I do not
particularly like using ~ on signed integers (and other permission masks
are usually uint64_t, too).

Reported-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 1dce698e

block/file-posix.c

+2 −2
Original line number Diff line number Diff line
@@ -2112,7 +2112,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp) 
{

    BlockdevCreateOptionsFile *file_opts;

    int fd;

    int perm, shared;

    uint64_t perm, shared;

    int result = 0;



    /* Validate options and set default values */
@@ -2148,7 +2148,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp) 
    shared = BLK_PERM_ALL & ~BLK_PERM_RESIZE;



    /* Step one: Take locks */

    result = raw_apply_lock_bytes(fd, perm, shared, false, errp);

    result = raw_apply_lock_bytes(fd, perm, ~shared, false, errp);

    if (result < 0) {

        goto out_close;

    }