From: Hanna Reitz <hreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Hanna Reitz <hreitz@redhat.com>,
qemu-devel@nongnu.org
Subject: [PULL 15/32] block/mirror: fix NULL pointer dereference in mirror_wait_on_conflicts()
Date: Wed, 15 Sep 2021 19:53:01 +0200 [thread overview]
Message-ID: <20210915175318.853225-16-hreitz@redhat.com> (raw)
In-Reply-To: <20210915175318.853225-1-hreitz@redhat.com>
From: Stefano Garzarella <sgarzare@redhat.com>
In mirror_iteration() we call mirror_wait_on_conflicts() with
`self` parameter set to NULL.
Starting from commit d44dae1a7c we dereference `self` pointer in
mirror_wait_on_conflicts() without checks if it is not NULL.
Backtrace:
Program terminated with signal SIGSEGV, Segmentation fault.
#0 mirror_wait_on_conflicts (self=0x0, s=<optimized out>, offset=<optimized out>, bytes=<optimized out>)
at ../block/mirror.c:172
172 self->waiting_for_op = op;
[Current thread is 1 (Thread 0x7f0908931ec0 (LWP 380249))]
(gdb) bt
#0 mirror_wait_on_conflicts (self=0x0, s=<optimized out>, offset=<optimized out>, bytes=<optimized out>)
at ../block/mirror.c:172
#1 0x00005610c5d9d631 in mirror_run (job=0x5610c76a2c00, errp=<optimized out>) at ../block/mirror.c:491
#2 0x00005610c5d58726 in job_co_entry (opaque=0x5610c76a2c00) at ../job.c:917
#3 0x00005610c5f046c6 in coroutine_trampoline (i0=<optimized out>, i1=<optimized out>)
at ../util/coroutine-ucontext.c:173
#4 0x00007f0909975820 in ?? () at ../sysdeps/unix/sysv/linux/x86_64/__start_context.S:91
from /usr/lib64/libc.so.6
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2001404
Fixes: d44dae1a7c ("block/mirror: fix active mirror dead-lock in mirror_wait_on_conflicts")
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20210910124533.288318-1-sgarzare@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
block/mirror.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 98fc66eabf..85b781bc21 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -160,18 +160,25 @@ static void coroutine_fn mirror_wait_on_conflicts(MirrorOp *self,
if (ranges_overlap(self_start_chunk, self_nb_chunks,
op_start_chunk, op_nb_chunks))
{
- /*
- * If the operation is already (indirectly) waiting for us, or
- * will wait for us as soon as it wakes up, then just go on
- * (instead of producing a deadlock in the former case).
- */
- if (op->waiting_for_op) {
- continue;
+ if (self) {
+ /*
+ * If the operation is already (indirectly) waiting for us,
+ * or will wait for us as soon as it wakes up, then just go
+ * on (instead of producing a deadlock in the former case).
+ */
+ if (op->waiting_for_op) {
+ continue;
+ }
+
+ self->waiting_for_op = op;
}
- self->waiting_for_op = op;
qemu_co_queue_wait(&op->waiting_requests, NULL);
- self->waiting_for_op = NULL;
+
+ if (self) {
+ self->waiting_for_op = NULL;
+ }
+
break;
}
}
--
2.31.1
next prev parent reply other threads:[~2021-09-15 18:04 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 17:52 [PULL 00/32] Block patches Hanna Reitz
2021-09-15 17:52 ` [PULL 01/32] gluster: Align block-status tail Hanna Reitz
2021-09-15 17:52 ` [PULL 02/32] block: Drop BDS comment regarding bdrv_append() Hanna Reitz
2021-09-15 17:52 ` [PULL 03/32] block: block-status cache for data regions Hanna Reitz
2021-09-15 17:52 ` [PULL 04/32] block: Clarify that @bytes is no limit on *pnum Hanna Reitz
2021-09-15 17:52 ` [PULL 05/32] block/file-posix: Do not force-cap *pnum Hanna Reitz
2021-09-15 17:52 ` [PULL 06/32] block/gluster: " Hanna Reitz
2021-09-15 17:52 ` [PULL 07/32] block/iscsi: " Hanna Reitz
2021-09-15 17:52 ` [PULL 08/32] iotests: Fix unspecified-encoding pylint warnings Hanna Reitz
2021-09-15 17:52 ` [PULL 09/32] iotests: Fix use-{list,dict}-literal warnings Hanna Reitz
2021-09-15 17:52 ` [PULL 10/32] iotests/297: Drop 169 and 199 from the skip list Hanna Reitz
2021-09-15 17:52 ` [PULL 11/32] migrate-bitmaps-postcopy-test: Fix pylint warnings Hanna Reitz
2021-09-15 17:52 ` [PULL 12/32] migrate-bitmaps-test: " Hanna Reitz
2021-09-15 17:52 ` [PULL 13/32] mirror-top-perms: Fix AbnormalShutdown path Hanna Reitz
2021-09-15 17:53 ` [PULL 14/32] iotests/297: Cover tests/ Hanna Reitz
2021-09-15 17:53 ` Hanna Reitz [this message]
2021-09-15 17:53 ` [PULL 16/32] tests: add migrate-during-backup Hanna Reitz
2021-09-15 17:53 ` [PULL 17/32] block: bdrv_inactivate_recurse(): check for permissions and fix crash Hanna Reitz
2021-09-15 17:53 ` [PULL 18/32] simplebench: add img_bench_templater.py Hanna Reitz
2021-09-15 17:53 ` [PULL 19/32] qcow2: refactor handle_dependencies() loop body Hanna Reitz
2021-09-15 17:53 ` [PULL 20/32] qcow2: handle_dependencies(): relax conflict detection Hanna Reitz
2021-09-15 17:53 ` [PULL 21/32] qemu-img: Allow target be aligned to sector size Hanna Reitz
2021-09-15 17:53 ` [PULL 22/32] qcow2-refcount: improve style of check_refcounts_l2() Hanna Reitz
2021-09-15 17:53 ` [PULL 23/32] qcow2: compressed read: simplify cluster descriptor passing Hanna Reitz
2021-09-15 17:53 ` [PULL 24/32] qcow2: introduce qcow2_parse_compressed_l2_entry() helper Hanna Reitz
2021-09-15 17:53 ` [PULL 25/32] qcow2-refcount: introduce fix_l2_entry_by_zero() Hanna Reitz
2021-09-15 17:53 ` [PULL 26/32] qcow2-refcount: fix_l2_entry_by_zero(): also zero L2 entry bitmap Hanna Reitz
2021-09-15 17:53 ` [PULL 27/32] qcow2-refcount: check_refcounts_l2(): check l2_bitmap Hanna Reitz
2021-09-15 17:53 ` [PULL 28/32] qcow2-refcount: check_refcounts_l2(): check reserved bits Hanna Reitz
2021-09-15 17:53 ` [PULL 29/32] qcow2-refcount: improve style of check_refcounts_l1() Hanna Reitz
2021-09-15 17:53 ` [PULL 30/32] qcow2-refcount: check_refcounts_l1(): check reserved bits Hanna Reitz
2021-09-15 17:53 ` [PULL 31/32] qcow2-refcount: check_refblocks(): add separate message for reserved Hanna Reitz
2021-09-15 17:53 ` [PULL 32/32] qemu-img: Add -F shorthand to convert Hanna Reitz
2021-09-16 10:18 ` [PULL 00/32] Block patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210915175318.853225-16-hreitz@redhat.com \
--to=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).