From: Jason Dillaman Date: Mon, 16 Mar 2015 22:35:07 +0000 (-0400) Subject: librbd: get_parent_info should protect against invalid parent X-Git-Tag: v0.94~2^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=572a2f5707f91f11c3ccaeca3ae88d8914d3dbc2;p=ceph.git librbd: get_parent_info should protect against invalid parent get_parent_info should return -ENOENT if the image does not have an associated parent image. Signed-off-by: Jason Dillaman (cherry picked from commit 21afd0ef8e1fb81c5ace5fd403513c542e2413e3) --- diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 8f5f040f52a..2651ba6208f 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -1426,6 +1426,9 @@ reprotect_and_return_err: RWLock::RLocker l(ictx->snap_lock); RWLock::RLocker l2(ictx->parent_lock); + if (ictx->parent == NULL) { + return -ENOENT; + } parent_spec parent_spec;