39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
From: Peng Liang <liangpeng10@huawei.com>
|
||
|
|
Date: Mon, 16 Nov 2020 22:13:38 +0800
|
||
|
|
Subject: ui/vnc: Add missing lock for send_color_map
|
||
|
|
|
||
|
|
Git-commit: 947191b4312a547621566d77d7b922d9e13bb63d
|
||
|
|
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>
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
ui/vnc.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/ui/vnc.c b/ui/vnc.c
|
||
|
|
index 49235056f7a893f5f7c86500afbc..ca3fc376aeb547681e5a26a480b6 100644
|
||
|
|
--- a/ui/vnc.c
|
||
|
|
+++ b/ui/vnc.c
|
||
|
|
@@ -2156,6 +2156,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 */
|
||
|
|
@@ -2168,6 +2169,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,
|