[Qemu-commits] [qemu/qemu] 0696ae: qcow: fix memory leaks related to encryption

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0696ae2c9236a3589f5eaf5b00c12868b6f30a17
      
https://github.com/qemu/qemu/commit/0696ae2c9236a3589f5eaf5b00c12868b6f30a17
  Author: Daniel P. Berrange <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M block/qcow.c
    M block/qcow2.c

  Log Message:
  -----------
  qcow: fix memory leaks related to encryption

Fix leak of the 'encryptopts' string, which was mistakenly
declared const.

Fix leak of QemuOpts entry which should not have been deleted
from the opts array.

Reported by: coverity
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: b6b75a99dab760c902c3d355519e0dc2616872e1
      
https://github.com/qemu/qemu/commit/b6b75a99dab760c902c3d355519e0dc2616872e1
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M block/qcow2-bitmap.c

  Log Message:
  -----------
  qcow2-bitmap: fix bitmap_free

Fix possible crash on error path in
qcow2_remove_persistent_dirty_bitmap. Although bitmap_free was added in
88ddffae8fc the bug was introduced later in commit 469c71edc72 (when
qcow2_remove_persistent_dirty_bitmap was added).

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


  Commit: bd998d7cc8ced211def90e4225042d63dddecc54
      
https://github.com/qemu/qemu/commit/bd998d7cc8ced211def90e4225042d63dddecc54
  Author: Kevin Wolf <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M tests/qemu-iotests/186.out

  Log Message:
  -----------
  qemu-iotests: Fix reference output for 186

Commits 70f17a1 ('error: Revert unwanted change of warning messages')
and e1824e5 ('qemu-iotests: Test 'info block'') had a semantic merge
conflict, which results in failure for qemu-iotests case 186. Fix the
reference output to consider the changes of 70f17a1.

Signed-off-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 0f1e9c80941cca7721bf71ab19bf2c06c853169c
      
https://github.com/qemu/qemu/commit/0f1e9c80941cca7721bf71ab19bf2c06c853169c
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M block/qcow.c
    M block/qcow2-bitmap.c
    M block/qcow2.c
    M tests/qemu-iotests/186.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-07-25' 
into staging

Block patches for 2.10-rc0

# gpg: Signature made Tue 25 Jul 2017 15:35:12 BST
# gpg:                using RSA key 0xF407DB0061D5CF40
# gpg: Good signature from "Max Reitz <address@hidden>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2017-07-25:
  qemu-iotests: Fix reference output for 186
  qcow2-bitmap: fix bitmap_free
  qcow: fix memory leaks related to encryption

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


Compare: https://github.com/qemu/qemu/compare/4c4414a4388f...0f1e9c80941c