From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peng Liang <liangpeng10@huawei.com>,
Euler Robot <euler.robot@huawei.com>,
Gerd Hoffmann <kraxel@redhat.com>,
qemu-stable@nongnu.org
Subject: [PULL 7/8] ui/vnc: Add missing lock for send_color_map
Date: Fri, 11 Dec 2020 10:12:49 +0100 [thread overview]
Message-ID: <20201211091250.1415-8-kraxel@redhat.com> (raw)
In-Reply-To: <20201211091250.1415-1-kraxel@redhat.com>
From: Peng Liang <liangpeng10@huawei.com>
vnc_write() should be locked after the RFB protocol is initialized.
Fixes: 0c426e4534b4 ("vnc: Add support for color map")
Cc: qemu-stable@nongnu.org
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Peng Liang <liangpeng10@huawei.com>
Message-id: 20201116141338.148911-1-liangpeng10@huawei.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/vnc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
index 247e80d8f5c8..34e6dc437c0f 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2168,6 +2168,7 @@ static void send_color_map(VncState *vs)
{
int i;
+ vnc_lock_output(vs);
vnc_write_u8(vs, VNC_MSG_SERVER_SET_COLOUR_MAP_ENTRIES);
vnc_write_u8(vs, 0); /* padding */
vnc_write_u16(vs, 0); /* first color */
@@ -2180,6 +2181,7 @@ static void send_color_map(VncState *vs)
vnc_write_u16(vs, (((i >> pf->gshift) & pf->gmax) << (16 - pf->gbits)));
vnc_write_u16(vs, (((i >> pf->bshift) & pf->bmax) << (16 - pf->bbits)));
}
+ vnc_unlock_output(vs);
}
static void set_pixel_format(VncState *vs, int bits_per_pixel,
--
2.27.0
next prev parent reply other threads:[~2020-12-11 9:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
2020-12-11 9:12 ` [PULL 1/8] console: drop qemu_console_get_ui_info Gerd Hoffmann
2020-12-11 9:12 ` [PULL 2/8] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported Gerd Hoffmann
2020-12-11 9:12 ` [PULL 3/8] vnc: use enum for features Gerd Hoffmann
2020-12-11 9:12 ` [PULL 4/8] vnc: drop unused copyrect feature Gerd Hoffmann
2020-12-11 9:12 ` [PULL 5/8] vnc: add pseudo encodings Gerd Hoffmann
2020-12-11 9:12 ` [PULL 6/8] vnc: add alpha cursor support Gerd Hoffmann
2020-12-11 9:12 ` Gerd Hoffmann [this message]
2020-12-11 9:12 ` [PULL 8/8] sdl2: Add extra mouse buttons Gerd Hoffmann
2020-12-11 19:30 ` [PULL 0/8] Ui 20201211 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=20201211091250.1415-8-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=euler.robot@huawei.com \
--cc=liangpeng10@huawei.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.