[Qemu-commits] [qemu/qemu] 148546: qcow2: Drop unused cluster_data

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 148546c8222e922c5dcc652b81cb97ea2ad4fd5b
      
https://github.com/qemu/qemu/commit/148546c8222e922c5dcc652b81cb97ea2ad4fd5b
  Author: Fam Zheng <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Drop unused cluster_data

Reported-by: Max Reitz <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 9f850f67adc8d8b333cceae023a6462e184848cd
      
https://github.com/qemu/qemu/commit/9f850f67adc8d8b333cceae023a6462e184848cd
  Author: Fam Zheng <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M block/file-posix.c

  Log Message:
  -----------
  file-posix: Fix fd_open check in raw_co_copy_range_to

One of them is a typo. But update both to be more readable.

Reported-by: Kevin Wolf <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 65f1899e9bcd4faa147a5d907dc13fd7dbbbc0c7
      
https://github.com/qemu/qemu/commit/65f1899e9bcd4faa147a5d907dc13fd7dbbbc0c7
  Author: Fam Zheng <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Drop unreachable break

Reported-by: Max Reitz <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 6d6bcc46b552c67aa14f25e69d518684b3e59361
      
https://github.com/qemu/qemu/commit/6d6bcc46b552c67aa14f25e69d518684b3e59361
  Author: Fam Zheng <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M block/raw-format.c

  Log Message:
  -----------
  raw: Drop superfluous semicolon

Reported-by: Max Reitz <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 439e89fc09ab6070f9613c4c513a4d4f133b23b7
      
https://github.com/qemu/qemu/commit/439e89fc09ab6070f9613c4c513a4d4f133b23b7
  Author: Max Reitz <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: Fix possible segfault with non-VMDK backing

VMDK performs a probing check in vmdk_co_create_opts() to prevent the
user from assigning non-VMDK files as a backing file, because it only
supports VMDK backing files.  However, with the @backing runtime option,
it is possible to assign arbitrary nodes as backing nodes, regardless of
what the image header says.  Therefore, VMDK may not just access backing
nodes assuming they are VMDK nodes -- which it does, because it needs to
compare the backing file's CID with the overlay's parentCID value, and
naturally the backing file only has a CID when it's a VMDK file.
Instead, it should report the CID of non-VMDK backing files not to match
the overlay because clearly a non-present CID does not match.

Without this change, vmdk_read_cid() reads from the backing file's
bs->file, which may be NULL (in which case we get a segfault).  Also, it
interprets bs->opaque as a BDRVVmdkState and then reads from the
.desc_offset field, which usually will just return some arbitrary value
which then results in either garbage to be read, or bdrv_pread() to
return an error, both of which result in a non-matching CID to be
reported.

(In a very unlikely case, we could read something that looks like a
VMDK descriptor, and then get a CID which might actually match.  But
that is highly unlikely, and the only result would be that VMDK accepts
the backing file which is not too bad (albeit unintentional).)

((And in theory, the seek to .desc_offset might leak data from another
block driver's opaque object.  But then again, the user should realize
very quickly that a non-VMDK backing file does not work (because the
read will very likely fail, due to the reasons given above), so this
should not be exploitable.))

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 85456e0d16434ffe5b33f1354cd893180f2fb235
      
https://github.com/qemu/qemu/commit/85456e0d16434ffe5b33f1354cd893180f2fb235
  Author: Max Reitz <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    A tests/qemu-iotests/225
    A tests/qemu-iotests/225.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  iotests: Add VMDK backing file correlation test

This new test verifies that VMDK backing file reads fail when the
backing file has a non-matching CID.  This includes non-VMDK backing
files.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: 0e4e4318eaa56c831001bdf617094807ec6d451c
      
https://github.com/qemu/qemu/commit/0e4e4318eaa56c831001bdf617094807ec6d451c
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M block/qcow2-bitmap.c
    M block/qcow2-refcount.c
    M block/qcow2.c
    M block/qcow2.h
    M qapi/block-core.json

  Log Message:
  -----------
  qcow2: add overlap check for bitmap directory

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: 6784273a0e97a2a348f6ae983408aa00ef4a3132
      
https://github.com/qemu/qemu/commit/6784273a0e97a2a348f6ae983408aa00ef4a3132
  Author: Peter Maydell <address@hidden>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M block/file-posix.c
    M block/qcow2-bitmap.c
    M block/qcow2-refcount.c
    M block/qcow2.c
    M block/qcow2.h
    M block/raw-format.c
    M block/vmdk.c
    M qapi/block-core.json
    A tests/qemu-iotests/225
    A tests/qemu-iotests/225.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/xanclic/tags/pull-block-2018-07-09' 
into staging

Block patches for 3.0-rc0:
- qcow2 metadata overlap protection for the persistent bitmap directory
- Various bug fixes

# gpg: Signature made Mon 09 Jul 2018 19:54:38 BST
# gpg:                using RSA key F407DB0061D5CF40
# gpg: Good signature from "Max Reitz <address@hidden>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/xanclic/tags/pull-block-2018-07-09:
  qcow2: add overlap check for bitmap directory
  iotests: Add VMDK backing file correlation test
  vmdk: Fix possible segfault with non-VMDK backing
  raw: Drop superfluous semicolon
  qcow2: Drop unreachable break
  file-posix: Fix fd_open check in raw_co_copy_range_to
  qcow2: Drop unused cluster_data

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b34181056c04...6784273a0e97
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.