From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zdenek Kabelac Date: Fri, 16 Oct 2020 19:11:22 +0000 (GMT) Subject: stable-2.02 - lvconvert_poll: ensure LV has snapshot type Message-ID: <20201016191122.6B4FC396EC88@sourceware.org> List-Id: To: lvm-devel@redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9c6089b2d0472a6e212ad0838009f47d611ac1b2 Commit: 9c6089b2d0472a6e212ad0838009f47d611ac1b2 Parent: a83e1536704c028b96b91b74fcf8e5809cdf0014 Author: Wu Guanghao AuthorDate: Fri Sep 11 17:41:01 2020 +0800 Committer: Zdenek Kabelac CommitterDate: Fri Oct 16 17:07:58 2020 +0200 lvconvert_poll: ensure LV has snapshot type LV may not be a snapshot type, the return value of find_snapshot(lv) may be NULL. Here, we will call stack if LV is not a snapshot type. Signed-off-by: Wu Guanghao Signed-off-by: Zhiqiang Liu --- tools/lvconvert_poll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lvconvert_poll.c b/tools/lvconvert_poll.c index b9ec316e1..0eae74616 100644 --- a/tools/lvconvert_poll.c +++ b/tools/lvconvert_poll.c @@ -176,7 +176,7 @@ progress_t poll_thin_merge_progress(struct cmd_context *cmd, { uint32_t device_id; - if (!lv_thin_device_id(lv, &device_id)) { + if (!lv_thin_device_id(lv, &device_id) && !lv_is_snapshot(lv)) { stack; return PROGRESS_CHECK_FAILED; }