[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 48/54] nbd/server: Use real permissions for NBD expo
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 48/54] nbd/server: Use real permissions for NBD exports |
Date: |
Tue, 21 Feb 2017 15:58:44 +0100 |
NBD can't cope with device size changes, so resize must be forbidden,
but otherwise we can tolerate anything. Depending on whether the export
is writable or not, we only require consistent reads and writes.
Signed-off-by: Kevin Wolf <address@hidden>
---
nbd/server.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 89362ba..924a1fe 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -891,10 +891,17 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t
dev_offset, off_t size,
{
BlockBackend *blk;
NBDExport *exp = g_malloc0(sizeof(NBDExport));
+ uint64_t perm;
int ret;
- /* FIXME Use real permissions */
- blk = blk_new(0, BLK_PERM_ALL);
+ /* Don't allow resize while the NBD server is running, otherwise we don't
+ * care what happens with the node. */
+ perm = BLK_PERM_CONSISTENT_READ;
+ if ((nbdflags & NBD_FLAG_READ_ONLY) == 0) {
+ perm |= BLK_PERM_WRITE;
+ }
+ blk = blk_new(perm, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE_UNCHANGED |
+ BLK_PERM_WRITE | BLK_PERM_GRAPH_MOD);
ret = blk_insert_bs(blk, bs, errp);
if (ret < 0) {
goto fail;
--
1.8.3.1
- [Qemu-devel] [PATCH 45/54] commit: Add filter-node-name to block-commit, (continued)
- [Qemu-devel] [PATCH 45/54] commit: Add filter-node-name to block-commit, Kevin Wolf, 2017/02/21
- [Qemu-devel] [PATCH 49/54] tests: Remove FIXME comments, Kevin Wolf, 2017/02/21
- [Qemu-devel] [PATCH 51/54] block: Assertions for write permissions, Kevin Wolf, 2017/02/21
- [Qemu-devel] [PATCH 47/54] migration/block: Use real permissions, Kevin Wolf, 2017/02/21
- [Qemu-devel] [PATCH 50/54] block: Pass BdrvChild to bdrv_aligned_preadv/pwritev, Kevin Wolf, 2017/02/21
- [Qemu-devel] [PATCH 48/54] nbd/server: Use real permissions for NBD exports,
Kevin Wolf <=
- [Qemu-devel] [PATCH 52/54] block: Assertions for resize permission, Kevin Wolf, 2017/02/21
- [Qemu-devel] [PATCH 53/54] block: Add Error parameter to bdrv_set_backing_hd(), Kevin Wolf, 2017/02/21
- [Qemu-devel] [PATCH 54/54] block: Add Error parameter to bdrv_append(), Kevin Wolf, 2017/02/21
- Re: [Qemu-devel] [PATCH 00/54] New op blocker system, part 1, no-reply, 2017/02/21
- Re: [Qemu-devel] [PATCH 00/54] New op blocker system, part 1, Kevin Wolf, 2017/02/24