Block patches for 6.2-rc2:
- Fix memory leak in vvfat when vvfat_open() fails - iotest fixes for the gnutls crypto backend -----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEEy2LXoO44KeRfAE00ofpA0JgBnN8FAmGdD40SHGhyZWl0ekBy ZWRoYXQuY29tAAoJEKH6QNCYAZzf/CwQAKBCQS7HhSxNbXuDGlX6uxLOZ8cQCsWi bgty//YEBxEm0p8xJU/BSTwFMWBvGqSyGw6fYrH1YOmQMaec5kMyGJFf++a029DW +liqTGOM5HCOXt1Ky7siVcaPtPC5w2fxK0SVhqnPazKhACuJbwfu2noH65RY0IL5 wnVQvAG04Puwpv0/rXuMGIap5lxO8NTXZ7K9jH+L5eAvlYa8z7XWh7RgWS8s92YK nxIXkcYmsZLkbpRRQbP/5epckpQeMVjkqTWkjecYOfCMIGEY9IEI5Dsiz+c+S5rd JZGsPY2mEJko4VYAdMUvyIVHWpL0cVv0cWmSxrJBJ+iqHaFkT8hEY3CtHzkGcb0Q N8GxLTyVf4Nh3Dsyx/T3WvrGCJyaCpypG+kCTldSk8RSDa3rNuaMoKyVa7P4Hno5 xxEItEulozzyzGtqnJjQtFq06KlAK1nC5Y16S/77wivYsTw3ywS0sCB5qJNBQ0DP MQ96KadJBMb7tp/IbtArFOQjp2cUO+QKz1/U3Vuw2sEp+fUBTERR1u7zgBdfVGt0 lZa6ThXBN471Dxg8vpJtFDn+7zXm9APpTtsMYYbanbaKX5dlLIUA4Xr6/C58cUAk xjky2bJvraTVt74glsRaOa+venMiNJzXJ/vw82nNRJQZ/bfFlsFh8oz+w1G8uqYE TkzgJ+P1S9JM =Cel9 -----END PGP SIGNATURE----- Merge tag 'pull-block-2021-11-23' of https://gitlab.com/hreitz/qemu into staging Block patches for 6.2-rc2: - Fix memory leak in vvfat when vvfat_open() fails - iotest fixes for the gnutls crypto backend # gpg: Signature made Tue 23 Nov 2021 04:58:05 PM CET # gpg: using RSA key CB62D7A0EE3829E45F004D34A1FA40D098019CDF # gpg: issuer "hreitz@redhat.com" # gpg: Good signature from "Hanna Reitz <hreitz@redhat.com>" [marginal] # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: CB62 D7A0 EE38 29E4 5F00 4D34 A1FA 40D0 9801 9CDF * tag 'pull-block-2021-11-23' of https://gitlab.com/hreitz/qemu: iotests/149: Skip on unsupported ciphers iotests: Use aes-128-cbc block/vvfat.c fix leak when failure occurs Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
commit
35133781bd
@ -1279,8 +1279,18 @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
|
||||
|
||||
qemu_co_mutex_init(&s->lock);
|
||||
|
||||
ret = 0;
|
||||
qemu_opts_del(opts);
|
||||
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
g_free(s->qcow_filename);
|
||||
s->qcow_filename = NULL;
|
||||
g_free(s->cluster_buffer);
|
||||
s->cluster_buffer = NULL;
|
||||
g_free(s->used_clusters);
|
||||
s->used_clusters = NULL;
|
||||
|
||||
qemu_opts_del(opts);
|
||||
return ret;
|
||||
}
|
||||
@ -3118,7 +3128,7 @@ static int enable_write_target(BlockDriverState *bs, Error **errp)
|
||||
int size = sector2cluster(s, s->sector_count);
|
||||
QDict *options;
|
||||
|
||||
s->used_clusters = calloc(size, 1);
|
||||
s->used_clusters = g_malloc0(size);
|
||||
|
||||
array_init(&(s->commits), sizeof(commit_t));
|
||||
|
||||
@ -3166,8 +3176,6 @@ static int enable_write_target(BlockDriverState *bs, Error **errp)
|
||||
return 0;
|
||||
|
||||
err:
|
||||
g_free(s->qcow_filename);
|
||||
s->qcow_filename = NULL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@ -230,6 +230,18 @@ def create_image(config, size_mb):
|
||||
fn.truncate(size_mb * 1024 * 1024)
|
||||
|
||||
|
||||
def check_cipher_support(config, output):
|
||||
"""Check the output of qemu-img or qemu-io for mention of the respective
|
||||
cipher algorithm being unsupported, and if so, skip this test.
|
||||
(Returns `output` for convenience.)"""
|
||||
|
||||
if 'Unsupported cipher algorithm' in output:
|
||||
iotests.notrun('Unsupported cipher algorithm '
|
||||
f'{config.cipher}-{config.keylen}-{config.mode}; '
|
||||
'consider configuring qemu with a different crypto '
|
||||
'backend')
|
||||
return output
|
||||
|
||||
def qemu_img_create(config, size_mb):
|
||||
"""Create and format a disk image with LUKS using qemu-img"""
|
||||
|
||||
@ -253,7 +265,8 @@ def qemu_img_create(config, size_mb):
|
||||
"%dM" % size_mb]
|
||||
|
||||
iotests.log("qemu-img " + " ".join(args), filters=[iotests.filter_test_dir])
|
||||
iotests.log(iotests.qemu_img_pipe(*args), filters=[iotests.filter_test_dir])
|
||||
iotests.log(check_cipher_support(config, iotests.qemu_img_pipe(*args)),
|
||||
filters=[iotests.filter_test_dir])
|
||||
|
||||
def qemu_io_image_args(config, dev=False):
|
||||
"""Get the args for access an image or device with qemu-io"""
|
||||
@ -279,8 +292,8 @@ def qemu_io_write_pattern(config, pattern, offset_mb, size_mb, dev=False):
|
||||
args = ["-c", "write -P 0x%x %dM %dM" % (pattern, offset_mb, size_mb)]
|
||||
args.extend(qemu_io_image_args(config, dev))
|
||||
iotests.log("qemu-io " + " ".join(args), filters=[iotests.filter_test_dir])
|
||||
iotests.log(iotests.qemu_io(*args), filters=[iotests.filter_test_dir,
|
||||
iotests.filter_qemu_io])
|
||||
iotests.log(check_cipher_support(config, iotests.qemu_io(*args)),
|
||||
filters=[iotests.filter_test_dir, iotests.filter_qemu_io])
|
||||
|
||||
|
||||
def qemu_io_read_pattern(config, pattern, offset_mb, size_mb, dev=False):
|
||||
@ -291,8 +304,8 @@ def qemu_io_read_pattern(config, pattern, offset_mb, size_mb, dev=False):
|
||||
args = ["-c", "read -P 0x%x %dM %dM" % (pattern, offset_mb, size_mb)]
|
||||
args.extend(qemu_io_image_args(config, dev))
|
||||
iotests.log("qemu-io " + " ".join(args), filters=[iotests.filter_test_dir])
|
||||
iotests.log(iotests.qemu_io(*args), filters=[iotests.filter_test_dir,
|
||||
iotests.filter_qemu_io])
|
||||
iotests.log(check_cipher_support(config, iotests.qemu_io(*args)),
|
||||
filters=[iotests.filter_test_dir, iotests.filter_qemu_io])
|
||||
|
||||
|
||||
def test_once(config, qemu_img=False):
|
||||
|
||||
@ -162,8 +162,8 @@ with iotests.FilePath('t.qcow2') as disk_path, \
|
||||
'encrypt': {
|
||||
'format': 'luks',
|
||||
'key-secret': 'keysec0',
|
||||
'cipher-alg': 'twofish-128',
|
||||
'cipher-mode': 'ctr',
|
||||
'cipher-alg': 'aes-128',
|
||||
'cipher-mode': 'cbc',
|
||||
'ivgen-alg': 'plain64',
|
||||
'ivgen-hash-alg': 'md5',
|
||||
'hash-alg': 'sha1',
|
||||
|
||||
@ -97,7 +97,7 @@ Format specific information:
|
||||
|
||||
=== Successful image creation (encrypted) ===
|
||||
|
||||
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "qcow2", "encrypt": {"cipher-alg": "twofish-128", "cipher-mode": "ctr", "format": "luks", "hash-alg": "sha1", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0"}, "file": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2"}, "size": 33554432}}}
|
||||
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "qcow2", "encrypt": {"cipher-alg": "aes-128", "cipher-mode": "cbc", "format": "luks", "hash-alg": "sha1", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0"}, "file": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2"}, "size": 33554432}}}
|
||||
{"return": {}}
|
||||
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
|
||||
{"return": {}}
|
||||
@ -115,10 +115,10 @@ Format specific information:
|
||||
encrypt:
|
||||
ivgen alg: plain64
|
||||
hash alg: sha1
|
||||
cipher alg: twofish-128
|
||||
cipher alg: aes-128
|
||||
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
||||
format: luks
|
||||
cipher mode: ctr
|
||||
cipher mode: cbc
|
||||
slots:
|
||||
[0]:
|
||||
active: true
|
||||
|
||||
@ -83,8 +83,8 @@ with iotests.FilePath('t.luks') as disk_path, \
|
||||
},
|
||||
'size': size,
|
||||
'key-secret': 'keysec0',
|
||||
'cipher-alg': 'twofish-128',
|
||||
'cipher-mode': 'ctr',
|
||||
'cipher-alg': 'aes-128',
|
||||
'cipher-mode': 'cbc',
|
||||
'ivgen-alg': 'plain64',
|
||||
'ivgen-hash-alg': 'md5',
|
||||
'hash-alg': 'sha1',
|
||||
|
||||
@ -59,7 +59,7 @@ Format specific information:
|
||||
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
|
||||
{"return": {}}
|
||||
|
||||
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"cipher-alg": "twofish-128", "cipher-mode": "ctr", "driver": "luks", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.luks"}, "hash-alg": "sha1", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0", "size": 67108864}}}
|
||||
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"cipher-alg": "aes-128", "cipher-mode": "cbc", "driver": "luks", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.luks"}, "hash-alg": "sha1", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0", "size": 67108864}}}
|
||||
{"return": {}}
|
||||
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
|
||||
{"return": {}}
|
||||
@ -71,9 +71,9 @@ encrypted: yes
|
||||
Format specific information:
|
||||
ivgen alg: plain64
|
||||
hash alg: sha1
|
||||
cipher alg: twofish-128
|
||||
cipher alg: aes-128
|
||||
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
||||
cipher mode: ctr
|
||||
cipher mode: cbc
|
||||
slots:
|
||||
[0]:
|
||||
active: true
|
||||
|
||||
Loading…
Reference in New Issue
Block a user