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

Merge pull request #20478 from trociny/wip-api-mirror

Browse Source 
librbd: fix structure size check in rbd_mirror_image_get_info/status

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2018-02-20 10:31:14 -05:00 committed by GitHub
commit 0da7e351a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/librbd/api/Mirror.cc
View File

@ -408,13 +408,9 @@ int Mirror<I>::image_resync(I *ictx) {
template <typename I>
void Mirror<I>::image_get_info(I *ictx, mirror_image_info_t *mirror_image_info,
size_t info_size, Context *on_finish) {
Context *on_finish) {
CephContext *cct = ictx->cct;
ldout(cct, 20) << "ictx=" << ictx << dendl;
if (info_size < sizeof(mirror_image_info_t)) {
on_finish->complete(-ERANGE);
return;
}
auto ctx = new C_ImageGetInfo(mirror_image_info, on_finish);
auto req = mirror::GetInfoRequest<I>::create(*ictx, &ctx->mirror_image,
@ -424,10 +420,9 @@ void Mirror<I>::image_get_info(I *ictx, mirror_image_info_t *mirror_image_info,
}
template <typename I>
int Mirror<I>::image_get_info(I *ictx, mirror_image_info_t *mirror_image_info,
size_t info_size) {
int Mirror<I>::image_get_info(I *ictx, mirror_image_info_t *mirror_image_info) {
C_SaferCond ctx;
image_get_info(ictx, mirror_image_info, info_size, &ctx);
image_get_info(ictx, mirror_image_info, &ctx);
int r = ctx.wait();
if (r < 0) {
@ -438,13 +433,9 @@ int Mirror<I>::image_get_info(I *ictx, mirror_image_info_t *mirror_image_info,
template <typename I>
void Mirror<I>::image_get_status(I *ictx, mirror_image_status_t *status,
size_t status_size, Context *on_finish) {
Context *on_finish) {
CephContext *cct = ictx->cct;
ldout(cct, 20) << "ictx=" << ictx << dendl;
if (status_size < sizeof(mirror_image_status_t)) {
on_finish->complete(-ERANGE);
return;
}
auto ctx = new C_ImageGetStatus(ictx->name, status, on_finish);
auto req = mirror::GetStatusRequest<I>::create(
@ -454,10 +445,9 @@ void Mirror<I>::image_get_status(I *ictx, mirror_image_status_t *status,
}
template <typename I>
int Mirror<I>::image_get_status(I *ictx, mirror_image_status_t *status,
size_t status_size) {
int Mirror<I>::image_get_status(I *ictx, mirror_image_status_t *status) {
C_SaferCond ctx;
image_get_status(ictx, status, status_size, &ctx);
image_get_status(ictx, status, &ctx);
int r = ctx.wait();
if (r < 0) {

10
src/librbd/api/Mirror.h
View File

@ -50,15 +50,13 @@ struct Mirror {
static void image_demote(ImageCtxT *ictx, Context *on_finish);
static int image_resync(ImageCtxT *ictx);
static int image_get_info(ImageCtxT *ictx,
mirror_image_info_t *mirror_image_info,
size_t info_size);
mirror_image_info_t *mirror_image_info);
static void image_get_info(ImageCtxT *ictx,
mirror_image_info_t *mirror_image_info,
size_t info_size, Context *on_finish);
static int image_get_status(ImageCtxT *ictx, mirror_image_status_t *status,
size_t status_size);
Context *on_finish);
static int image_get_status(ImageCtxT *ictx, mirror_image_status_t *status);
static void image_get_status(ImageCtxT *ictx, mirror_image_status_t *status,
size_t status_size, Context *on_finish);
Context *on_finish);
};

58
src/librbd/librbd.cc
View File

@ -2056,15 +2056,23 @@ namespace librbd {
int Image::mirror_image_get_info(mirror_image_info_t *mirror_image_info,
size_t info_size) {
ImageCtx *ictx = (ImageCtx *)ctx;
return librbd::api::Mirror<>::image_get_info(ictx, mirror_image_info,
info_size);
if (sizeof(mirror_image_info_t) != info_size) {
return -ERANGE;
}
return librbd::api::Mirror<>::image_get_info(ictx, mirror_image_info);
}
int Image::mirror_image_get_status(mirror_image_status_t *mirror_image_status,
size_t status_size) {
ImageCtx *ictx = (ImageCtx *)ctx;
return librbd::api::Mirror<>::image_get_status(ictx, mirror_image_status,
status_size);
if (sizeof(mirror_image_status_t) != status_size) {
return -ERANGE;
}
return librbd::api::Mirror<>::image_get_status(ictx, mirror_image_status);
}
int Image::aio_mirror_image_promote(bool force, RBD::AioCompletion *c) {
@ -2087,8 +2095,13 @@ namespace librbd {
size_t info_size,
RBD::AioCompletion *c) {
ImageCtx *ictx = (ImageCtx *)ctx;
if (sizeof(mirror_image_info_t) != info_size) {
return -ERANGE;
}
librbd::api::Mirror<>::image_get_info(
ictx, mirror_image_info, info_size,
ictx, mirror_image_info,
new C_AioCompletion(ictx, librbd::io::AIO_TYPE_GENERIC,
get_aio_completion(c)));
return 0;
@ -2098,10 +2111,14 @@ namespace librbd {
size_t status_size,
RBD::AioCompletion *c) {
ImageCtx *ictx = (ImageCtx *)ctx;
if (sizeof(mirror_image_status_t) != status_size) {
return -ERANGE;
}
librbd::api::Mirror<>::image_get_status(
ictx, status, status_size,
new C_AioCompletion(ictx, librbd::io::AIO_TYPE_GENERIC,
get_aio_completion(c)));
ictx, status, new C_AioCompletion(ictx, librbd::io::AIO_TYPE_GENERIC,
get_aio_completion(c)));
return 0;
}
@ -4302,9 +4319,12 @@ extern "C" int rbd_mirror_image_get_info(rbd_image_t image,
{
librbd::ImageCtx *ictx = (librbd::ImageCtx *)image;
if (sizeof(rbd_mirror_image_info_t) != info_size) {
return -ERANGE;
}
librbd::mirror_image_info_t cpp_mirror_image;
int r = librbd::api::Mirror<>::image_get_info(ictx, &cpp_mirror_image,
sizeof(cpp_mirror_image));
int r = librbd::api::Mirror<>::image_get_info(ictx, &cpp_mirror_image);
if (r < 0) {
return r;
}
@ -4319,9 +4339,12 @@ extern "C" int rbd_mirror_image_get_status(rbd_image_t image,
{
librbd::ImageCtx *ictx = (librbd::ImageCtx *)image;
if (sizeof(rbd_mirror_image_status_t) != status_size) {
return -ERANGE;
}
librbd::mirror_image_status_t cpp_status;
int r = librbd::api::Mirror<>::image_get_status(ictx, &cpp_status,
sizeof(cpp_status));
int r = librbd::api::Mirror<>::image_get_status(ictx, &cpp_status);
if (r < 0) {
return r;
}
@ -4357,7 +4380,7 @@ extern "C" int rbd_aio_mirror_image_get_info(rbd_image_t image,
librbd::ImageCtx *ictx = (librbd::ImageCtx *)image;
librbd::RBD::AioCompletion *comp = (librbd::RBD::AioCompletion *)c;
if (sizeof(rbd_mirror_image_info_t) > info_size) {
if (sizeof(rbd_mirror_image_info_t) != info_size) {
return -ERANGE;
}
@ -4365,7 +4388,7 @@ extern "C" int rbd_aio_mirror_image_get_info(rbd_image_t image,
info, new C_AioCompletion(ictx, librbd::io::AIO_TYPE_GENERIC,
get_aio_completion(comp)));
librbd::api::Mirror<>::image_get_info(
ictx, &ctx->cpp_mirror_image_info, sizeof(ctx->cpp_mirror_image_info), ctx);
ictx, &ctx->cpp_mirror_image_info, ctx);
return 0;
}
@ -4376,16 +4399,15 @@ extern "C" int rbd_aio_mirror_image_get_status(rbd_image_t image,
librbd::ImageCtx *ictx = (librbd::ImageCtx *)image;
librbd::RBD::AioCompletion *comp = (librbd::RBD::AioCompletion *)c;
if (sizeof(rbd_mirror_image_status_t) > status_size) {
if (sizeof(rbd_mirror_image_status_t) != status_size) {
return -ERANGE;
}
auto ctx = new C_MirrorImageGetStatus(
status, new C_AioCompletion(ictx, librbd::io::AIO_TYPE_GENERIC,
get_aio_completion(comp)));
librbd::api::Mirror<>::image_get_status(
ictx, &ctx->cpp_mirror_image_status, sizeof(ctx->cpp_mirror_image_status),
ctx);
librbd::api::Mirror<>::image_get_status(ictx, &ctx->cpp_mirror_image_status,
ctx);
return 0;
}