block: Let callers request permissions when attaching a child node
When attaching a node as a child to a new parent, the required and shared permissions for this parent are checked against all other parents of the node now, and an error is returned if there is a conflict. This allows error returns to a function that previously always succeeded, and the same is true for quite a few callers and their callers. Converting all of them within the same patch would be too much, so for now everyone tells that they don't need any permissions and allow everyone else to do anything. This way we can use &error_abort initially and convert caller by caller to pass actual permission requirements and implement error handling. All these places are marked with FIXME comments and it will be the job of the next patches to clean them up again. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Acked-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
parent
8b2ff5291f
commit
d5e6f437c5
66
block.c
66
block.c
@ -1326,6 +1326,38 @@ static int bdrv_fill_options(QDict **options, const char *filename,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int bdrv_check_update_perm(BlockDriverState *bs, uint64_t new_used_perm,
|
||||||
|
uint64_t new_shared_perm,
|
||||||
|
BdrvChild *ignore_child, Error **errp)
|
||||||
|
{
|
||||||
|
BdrvChild *c;
|
||||||
|
|
||||||
|
/* There is no reason why anyone couldn't tolerate write_unchanged */
|
||||||
|
assert(new_shared_perm & BLK_PERM_WRITE_UNCHANGED);
|
||||||
|
|
||||||
|
QLIST_FOREACH(c, &bs->parents, next_parent) {
|
||||||
|
if (c == ignore_child) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((new_used_perm & c->shared_perm) != new_used_perm ||
|
||||||
|
(c->perm & new_shared_perm) != c->perm)
|
||||||
|
{
|
||||||
|
const char *user = NULL;
|
||||||
|
if (c->role->get_name) {
|
||||||
|
user = c->role->get_name(c);
|
||||||
|
if (user && !*user) {
|
||||||
|
user = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
error_setg(errp, "Conflicts with %s", user ?: "another operation");
|
||||||
|
return -EPERM;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs)
|
static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs)
|
||||||
{
|
{
|
||||||
BlockDriverState *old_bs = child->bs;
|
BlockDriverState *old_bs = child->bs;
|
||||||
@ -1350,14 +1382,25 @@ static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs)
|
|||||||
BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
|
BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
|
||||||
const char *child_name,
|
const char *child_name,
|
||||||
const BdrvChildRole *child_role,
|
const BdrvChildRole *child_role,
|
||||||
void *opaque)
|
uint64_t perm, uint64_t shared_perm,
|
||||||
|
void *opaque, Error **errp)
|
||||||
{
|
{
|
||||||
BdrvChild *child = g_new(BdrvChild, 1);
|
BdrvChild *child;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = bdrv_check_update_perm(child_bs, perm, shared_perm, NULL, errp);
|
||||||
|
if (ret < 0) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
child = g_new(BdrvChild, 1);
|
||||||
*child = (BdrvChild) {
|
*child = (BdrvChild) {
|
||||||
.bs = NULL,
|
.bs = NULL,
|
||||||
.name = g_strdup(child_name),
|
.name = g_strdup(child_name),
|
||||||
.role = child_role,
|
.role = child_role,
|
||||||
.opaque = opaque,
|
.perm = perm,
|
||||||
|
.shared_perm = shared_perm,
|
||||||
|
.opaque = opaque,
|
||||||
};
|
};
|
||||||
|
|
||||||
bdrv_replace_child(child, child_bs);
|
bdrv_replace_child(child, child_bs);
|
||||||
@ -1371,8 +1414,15 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs,
|
|||||||
const BdrvChildRole *child_role,
|
const BdrvChildRole *child_role,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
BdrvChild *child = bdrv_root_attach_child(child_bs, child_name, child_role,
|
BdrvChild *child;
|
||||||
parent_bs);
|
|
||||||
|
/* FIXME Use real permissions */
|
||||||
|
child = bdrv_root_attach_child(child_bs, child_name, child_role,
|
||||||
|
0, BLK_PERM_ALL, parent_bs, errp);
|
||||||
|
if (child == NULL) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
QLIST_INSERT_HEAD(&parent_bs->children, child, next);
|
QLIST_INSERT_HEAD(&parent_bs->children, child, next);
|
||||||
return child;
|
return child;
|
||||||
}
|
}
|
||||||
|
@ -163,7 +163,9 @@ BlockBackend *blk_new_open(const char *filename, const char *reference,
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
blk->root = bdrv_root_attach_child(bs, "root", &child_root, blk);
|
/* FIXME Use real permissions */
|
||||||
|
blk->root = bdrv_root_attach_child(bs, "root", &child_root,
|
||||||
|
0, BLK_PERM_ALL, blk, &error_abort);
|
||||||
|
|
||||||
return blk;
|
return blk;
|
||||||
}
|
}
|
||||||
@ -498,7 +500,9 @@ void blk_remove_bs(BlockBackend *blk)
|
|||||||
void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs)
|
void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs)
|
||||||
{
|
{
|
||||||
bdrv_ref(bs);
|
bdrv_ref(bs);
|
||||||
blk->root = bdrv_root_attach_child(bs, "root", &child_root, blk);
|
/* FIXME Use real permissions */
|
||||||
|
blk->root = bdrv_root_attach_child(bs, "root", &child_root,
|
||||||
|
0, BLK_PERM_ALL, blk, &error_abort);
|
||||||
|
|
||||||
notifier_list_notify(&blk->insert_bs_notifiers, blk);
|
notifier_list_notify(&blk->insert_bs_notifiers, blk);
|
||||||
if (blk->public.throttle_state) {
|
if (blk->public.throttle_state) {
|
||||||
|
@ -419,6 +419,18 @@ struct BdrvChild {
|
|||||||
char *name;
|
char *name;
|
||||||
const BdrvChildRole *role;
|
const BdrvChildRole *role;
|
||||||
void *opaque;
|
void *opaque;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Granted permissions for operating on this BdrvChild (BLK_PERM_* bitmask)
|
||||||
|
*/
|
||||||
|
uint64_t perm;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Permissions that can still be granted to other users of @bs while this
|
||||||
|
* BdrvChild is still attached to it. (BLK_PERM_* bitmask)
|
||||||
|
*/
|
||||||
|
uint64_t shared_perm;
|
||||||
|
|
||||||
QLIST_ENTRY(BdrvChild) next;
|
QLIST_ENTRY(BdrvChild) next;
|
||||||
QLIST_ENTRY(BdrvChild) next_parent;
|
QLIST_ENTRY(BdrvChild) next_parent;
|
||||||
};
|
};
|
||||||
@ -796,7 +808,8 @@ void hmp_drive_add_node(Monitor *mon, const char *optstr);
|
|||||||
BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
|
BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
|
||||||
const char *child_name,
|
const char *child_name,
|
||||||
const BdrvChildRole *child_role,
|
const BdrvChildRole *child_role,
|
||||||
void *opaque);
|
uint64_t perm, uint64_t shared_perm,
|
||||||
|
void *opaque, Error **errp);
|
||||||
void bdrv_root_unref_child(BdrvChild *child);
|
void bdrv_root_unref_child(BdrvChild *child);
|
||||||
|
|
||||||
const char *bdrv_get_parent_name(const BlockDriverState *bs);
|
const char *bdrv_get_parent_name(const BlockDriverState *bs);
|
||||||
|
Loading…
Reference in New Issue
Block a user