0dd8f840c7
- vdpa: Fix bug where vdpa appliance migration does not resume after rollback - block: Parse filenames only when explicitly requested (CVE-2024-4467) - block: introduce bdrv_open_file_child() helper - iotests/270: Don't store data-file with json: prefix in image (CVE-2024-4467) - iotests/244: Don't store data-file with protocol in image (CVE-2024-4467) - qcow2: Don't open data_file with BDRV_O_NO_IO (CVE-2024-4467) - qcow2: Do not reopen data_file in invalidate_cache - hw/intc/arm_gic: Fix deactivation of SPI lines chery-pick from 7175a562f157d39725ab396e39c1e8e410d206b3 - vhost-user: Skip unnecessary duplicated VHOST_USER_SET_LOG_BASE requests - target/ppc: Split off common embedded TLB init cheery-pick from 581eea5d656b73c6532109f4ced4c73fd4e5fd47` - vdpa: fix vdpa device migrate rollback wrong when suspend device failed 1. - hw/virtio/virtio-pci:Support shadow device for virtio-net/blk/scsi devices Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit ad45062d44e901468eeb8c4ac0729587daaa1e1f)
230 lines
9.8 KiB
Diff
230 lines
9.8 KiB
Diff
From effc2c56f7b5390fbe6041d3a6ecf4026371bc25 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Thu, 25 Apr 2024 14:56:02 +0200
|
|
Subject: [PATCH] block: Parse filenames only when explicitly requested
|
|
(CVE-2024-4467)
|
|
|
|
When handling image filenames from legacy options such as -drive or from
|
|
tools, these filenames are parsed for protocol prefixes, including for
|
|
the json:{} pseudo-protocol.
|
|
|
|
This behaviour is intended for filenames that come directly from the
|
|
command line and for backing files, which may come from the image file
|
|
itself. Higher level management tools generally take care to verify that
|
|
untrusted images don't contain a bad (or any) backing file reference;
|
|
'qemu-img info' is a suitable tool for this.
|
|
|
|
However, for other files that can be referenced in images, such as
|
|
qcow2 data files or VMDK extents, the string from the image file is
|
|
usually not verified by management tools - and 'qemu-img info' wouldn't
|
|
be suitable because in contrast to backing files, it already opens these
|
|
other referenced files. So here the string should be interpreted as a
|
|
literal local filename. More complex configurations need to be specified
|
|
explicitly on the command line or in QMP.
|
|
|
|
This patch changes bdrv_open_inherit() so that it only parses filenames
|
|
if a new parameter parse_filename is true. It is set for the top level
|
|
in bdrv_open(), for the file child and for the backing file child. All
|
|
other callers pass false and disable filename parsing this way.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
|
|
Signed-off-by: liuxiangdong <liuxiangdong5@huawei.com>
|
|
---
|
|
block.c | 75 ++++++++++++++++++++++++++++++++++++++-------------------
|
|
1 file changed, 50 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/block.c b/block.c
|
|
index 7b58fe57f8..a91117abda 100644
|
|
--- a/block.c
|
|
+++ b/block.c
|
|
@@ -85,6 +85,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
|
|
BlockDriverState *parent,
|
|
const BdrvChildClass *child_class,
|
|
BdrvChildRole child_role,
|
|
+ bool parse_filename,
|
|
Error **errp);
|
|
|
|
static bool bdrv_recurse_has_child(BlockDriverState *bs,
|
|
@@ -1929,7 +1930,8 @@ static void parse_json_protocol(QDict *options, const char **pfilename,
|
|
* block driver has been specified explicitly.
|
|
*/
|
|
static int bdrv_fill_options(QDict **options, const char *filename,
|
|
- int *flags, Error **errp)
|
|
+ int *flags, bool allow_parse_filename,
|
|
+ Error **errp)
|
|
{
|
|
const char *drvname;
|
|
bool protocol = *flags & BDRV_O_PROTOCOL;
|
|
@@ -1969,7 +1971,7 @@ static int bdrv_fill_options(QDict **options, const char *filename,
|
|
if (protocol && filename) {
|
|
if (!qdict_haskey(*options, "filename")) {
|
|
qdict_put_str(*options, "filename", filename);
|
|
- parse_filename = true;
|
|
+ parse_filename = allow_parse_filename;
|
|
} else {
|
|
error_setg(errp, "Can't specify 'file' and 'filename' options at "
|
|
"the same time");
|
|
@@ -3442,7 +3444,8 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options,
|
|
}
|
|
|
|
backing_hd = bdrv_open_inherit(backing_filename, reference, options, 0, bs,
|
|
- &child_of_bds, bdrv_backing_role(bs), errp);
|
|
+ &child_of_bds, bdrv_backing_role(bs), true,
|
|
+ errp);
|
|
if (!backing_hd) {
|
|
bs->open_flags |= BDRV_O_NO_BACKING;
|
|
error_prepend(errp, "Could not open backing file: ");
|
|
@@ -3475,7 +3478,8 @@ free_exit:
|
|
static BlockDriverState *
|
|
bdrv_open_child_bs(const char *filename, QDict *options, const char *bdref_key,
|
|
BlockDriverState *parent, const BdrvChildClass *child_class,
|
|
- BdrvChildRole child_role, bool allow_none, Error **errp)
|
|
+ BdrvChildRole child_role, bool allow_none,
|
|
+ bool parse_filename, Error **errp)
|
|
{
|
|
BlockDriverState *bs = NULL;
|
|
QDict *image_options;
|
|
@@ -3506,7 +3510,8 @@ bdrv_open_child_bs(const char *filename, QDict *options, const char *bdref_key,
|
|
}
|
|
|
|
bs = bdrv_open_inherit(filename, reference, image_options, 0,
|
|
- parent, child_class, child_role, errp);
|
|
+ parent, child_class, child_role, parse_filename,
|
|
+ errp);
|
|
if (!bs) {
|
|
goto done;
|
|
}
|
|
@@ -3516,6 +3521,26 @@ done:
|
|
return bs;
|
|
}
|
|
|
|
+static BdrvChild *bdrv_open_child_common(const char *filename,
|
|
+ QDict *options, const char *bdref_key,
|
|
+ BlockDriverState *parent,
|
|
+ const BdrvChildClass *child_class,
|
|
+ BdrvChildRole child_role,
|
|
+ bool allow_none, bool parse_filename,
|
|
+ Error **errp)
|
|
+{
|
|
+ BlockDriverState *bs;
|
|
+
|
|
+ bs = bdrv_open_child_bs(filename, options, bdref_key, parent, child_class,
|
|
+ child_role, allow_none, parse_filename, errp);
|
|
+ if (bs == NULL) {
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
+ return bdrv_attach_child(parent, bs, bdref_key, child_class, child_role,
|
|
+ errp);
|
|
+}
|
|
+
|
|
/*
|
|
* Opens a disk image whose options are given as BlockdevRef in another block
|
|
* device's options.
|
|
@@ -3537,20 +3562,15 @@ BdrvChild *bdrv_open_child(const char *filename,
|
|
BdrvChildRole child_role,
|
|
bool allow_none, Error **errp)
|
|
{
|
|
- BlockDriverState *bs;
|
|
-
|
|
- bs = bdrv_open_child_bs(filename, options, bdref_key, parent, child_class,
|
|
- child_role, allow_none, errp);
|
|
- if (bs == NULL) {
|
|
- return NULL;
|
|
- }
|
|
-
|
|
- return bdrv_attach_child(parent, bs, bdref_key, child_class, child_role,
|
|
- errp);
|
|
+ return bdrv_open_child_common(filename, options, bdref_key, parent,
|
|
+ child_class, child_role, allow_none, false,
|
|
+ errp);
|
|
}
|
|
|
|
/*
|
|
- * Wrapper on bdrv_open_child() for most popular case: open primary child of bs.
|
|
+ * This does mostly the same as bdrv_open_child(), but for opening the primary
|
|
+ * child of a node. A notable difference from bdrv_open_child() is that it
|
|
+ * enables filename parsing for protocol names (including json:).
|
|
*/
|
|
int bdrv_open_file_child(const char *filename,
|
|
QDict *options, const char *bdref_key,
|
|
@@ -3561,8 +3581,8 @@ int bdrv_open_file_child(const char *filename,
|
|
role = parent->drv->is_filter ?
|
|
(BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY) : BDRV_CHILD_IMAGE;
|
|
|
|
- parent->file = bdrv_open_child(filename, options, bdref_key, parent,
|
|
- &child_of_bds, role, false, errp);
|
|
+ parent->file = bdrv_open_child_common(filename, options, bdref_key, parent,
|
|
+ &child_of_bds, role, false, true, errp);
|
|
|
|
return parent->file ? 0 : -EINVAL;
|
|
}
|
|
@@ -3602,7 +3622,8 @@ BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp)
|
|
|
|
}
|
|
|
|
- bs = bdrv_open_inherit(NULL, reference, qdict, 0, NULL, NULL, 0, errp);
|
|
+ bs = bdrv_open_inherit(NULL, reference, qdict, 0, NULL, NULL, 0, false,
|
|
+ errp);
|
|
obj = NULL;
|
|
qobject_unref(obj);
|
|
visit_free(v);
|
|
@@ -3693,6 +3714,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
|
|
BlockDriverState *parent,
|
|
const BdrvChildClass *child_class,
|
|
BdrvChildRole child_role,
|
|
+ bool parse_filename,
|
|
Error **errp)
|
|
{
|
|
int ret;
|
|
@@ -3736,9 +3758,11 @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
|
|
}
|
|
|
|
/* json: syntax counts as explicit options, as if in the QDict */
|
|
- parse_json_protocol(options, &filename, &local_err);
|
|
- if (local_err) {
|
|
- goto fail;
|
|
+ if (parse_filename) {
|
|
+ parse_json_protocol(options, &filename, &local_err);
|
|
+ if (local_err) {
|
|
+ goto fail;
|
|
+ }
|
|
}
|
|
|
|
bs->explicit_options = qdict_clone_shallow(options);
|
|
@@ -3763,7 +3787,8 @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
|
|
parent->open_flags, parent->options);
|
|
}
|
|
|
|
- ret = bdrv_fill_options(&options, filename, &flags, &local_err);
|
|
+ ret = bdrv_fill_options(&options, filename, &flags, parse_filename,
|
|
+ &local_err);
|
|
if (ret < 0) {
|
|
goto fail;
|
|
}
|
|
@@ -3832,7 +3857,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
|
|
|
|
file_bs = bdrv_open_child_bs(filename, options, "file", bs,
|
|
&child_of_bds, BDRV_CHILD_IMAGE,
|
|
- true, &local_err);
|
|
+ true, true, &local_err);
|
|
if (local_err) {
|
|
goto fail;
|
|
}
|
|
@@ -3977,7 +4002,7 @@ BlockDriverState *bdrv_open(const char *filename, const char *reference,
|
|
QDict *options, int flags, Error **errp)
|
|
{
|
|
return bdrv_open_inherit(filename, reference, options, flags, NULL,
|
|
- NULL, 0, errp);
|
|
+ NULL, 0, true, errp);
|
|
}
|
|
|
|
/* Return true if the NULL-terminated @list contains @str */
|
|
--
|
|
2.41.0.windows.1
|
|
|