RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 00:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd-nbd: disallow mapping images >2TB in size

Browse Source 
Fixes: http://tracker.ceph.com/issues/17219
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
This commit is contained in:
Mykola Golub 2016-11-02 10:49:23 +02:00
parent 3d83dc8454
commit 2012b4dfc6
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/workunits/rbd/rbd-nbd.sh
View File

@ -4,6 +4,7 @@
POOL=rbd
IMAGE=testrbdnbd$$
TOO_LARGE_IMAGE=${IMAGE}_large
SUDO=sudo
SIZE=64
DATA=
@ -16,6 +17,7 @@ setup()
DATA=${TEMPDIR}/data
dd if=/dev/urandom of=${DATA} bs=1M count=${SIZE}
rbd --dest-pool ${POOL} --no-progress import ${DATA} ${IMAGE}
rbd -p ${POOL} create ${TOO_LARGE_IMAGE} --size 3T
if [ `id -u` = 0 ]
then
@ -38,6 +40,7 @@ function cleanup()
done
rbd -p ${POOL} remove ${IMAGE}
fi
rbd -p ${POOL} remove ${TOO_LARGE_IMAGE}
}
function expect_false()
@ -60,6 +63,7 @@ then
fi
expect_false ${SUDO} rbd-nbd map INVALIDIMAGE
expect_false ${SUDO} rbd-nbd --device INVALIDDEV map ${IMAGE}
expect_false ${SUDO} rbd-nbd map ${TOO_LARGE_IMAGE}
# map test using the first unused device
DEV=`${SUDO} rbd-nbd map ${POOL}/${IMAGE}`

8
src/tools/rbd_nbd/rbd-nbd.cc
View File

@ -594,6 +594,14 @@ static int do_map()
}
size = info.size;
if (size > (1UL << 32) * 512) {
r = -EFBIG;
cerr << "rbd-nbd: image is too large (" << prettybyte_t(size) << ", max is "
<< prettybyte_t((1UL << 32) * 512) << ")" << std::endl;
goto close_nbd;
}
r = ioctl(nbd, NBD_SET_SIZE, size);
if (r < 0) {
r = -errno;