RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 10:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd: fix crash when opening nonexistent snapshot

Browse Source 
Fixes: http://tracker.ceph.com/issues/24637
Signed-off-by: Mykola Golub <mgolub@suse.com>
This commit is contained in:
Mykola Golub 2018-06-22 20:50:51 +03:00
parent 8b3f3c8d38
commit 70936c3bb5
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librbd/image/OpenRequest.cc
View File

@ -515,8 +515,9 @@ Context *OpenRequest<I>::send_set_snap(int *result) {
m_image_ctx->snap_name);
}
if (snap_id == CEPH_NOSNAP) {
*result = -ENOENT;
return m_on_finish;
lderr(cct) << "failed to find snapshot " << m_image_ctx->snap_name << dendl;
send_close_image(-ENOENT);
return nullptr;
}
using klass = OpenRequest<I>;

8
src/test/librbd/test_internal.cc
View File

@ -142,6 +142,14 @@ TEST_F(TestInternal, OpenByID) {
close_image(ictx);
}
TEST_F(TestInternal, OpenSnapDNE) {
librbd::ImageCtx *ictx;
ASSERT_EQ(0, open_image(m_image_name, &ictx));
ictx = new librbd::ImageCtx(m_image_name, "", "unknown_snap", m_ioctx, true);
ASSERT_EQ(-ENOENT, ictx->state->open(true));
}
TEST_F(TestInternal, IsExclusiveLockOwner) {
REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK);