diff options
| author |   Rolf Eike Beer <eike@sf-mail.de> | 2019-06-30 16:01:53 +0200 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-07-16 19:16:22 +0200 |
| commit | 594b7ead9c34a3970c3e37f252a24869452fbf8f (patch) | |
| tree | 7469f6d712198db65212ced9fc2d0486be2bdf4b /net-libs/libvncserver/files | |
| parent | net-misc/ntpsec: remove older unstable versions (diff) | |
| download | gentoo-594b7ead9c34a3970c3e37f252a24869452fbf8f.tar.gz gentoo-594b7ead9c34a3970c3e37f252a24869452fbf8f.tar.bz2 gentoo-594b7ead9c34a3970c3e37f252a24869452fbf8f.zip | |
net-libs/libvncserver: add fix for unaligned access crash
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Closes: https://bugs.gentoo.org/686914
Closes: https://github.com/gentoo/gentoo/pull/12359
Closes: https://github.com/gentoo/gentoo/pull/12359
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-libs/libvncserver/files')
| -rw-r--r-- | net-libs/libvncserver/files/libvncserver-0.9.12-sparc-unaligned.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-sparc-unaligned.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-sparc-unaligned.patch new file mode 100644 index 000000000000..dce787f1295a --- /dev/null +++ b/net-libs/libvncserver/files/libvncserver-0.9.12-sparc-unaligned.patch @@ -0,0 +1,40 @@ +From 0cf1400c61850065de590d403f6d49e32882fd76 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer <eike@sf-mail.de> +Date: Tue, 28 May 2019 18:30:46 +0200 +Subject: [PATCH] fix crash because of unaligned accesses in + hybiReadAndDecode() + +--- + libvncserver/ws_decode.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/libvncserver/ws_decode.c b/libvncserver/ws_decode.c +index 441ebc7..10c44d1 100644 +--- a/libvncserver/ws_decode.c ++++ b/libvncserver/ws_decode.c +@@ -327,7 +327,6 @@ hybiReadAndDecode(ws_ctx_t *wsctx, char *dst, int len, int *sockRet, int nInBuf) + int bufsize; + int nextRead; + unsigned char *data; +- uint32_t *data32; + + /* if data was carried over, copy to start of buffer */ + memcpy(wsctx->writePos, wsctx->carryBuf, wsctx->carrylen); +@@ -383,10 +382,12 @@ hybiReadAndDecode(ws_ctx_t *wsctx, char *dst, int len, int *sockRet, int nInBuf) + /* for a possible base64 decoding, we decode multiples of 4 bytes until + * the whole frame is received and carry over any remaining bytes in the carry buf*/ + data = (unsigned char *)(wsctx->writePos - toDecode); +- data32= (uint32_t *)data; + + for (i = 0; i < (toDecode >> 2); i++) { +- data32[i] ^= wsctx->header.mask.u; ++ uint32_t tmp; ++ memcpy(&tmp, data + i * sizeof(tmp), sizeof(tmp)); ++ tmp ^= wsctx->header.mask.u; ++ memcpy(data + i * sizeof(tmp), &tmp, sizeof(tmp)); + } + ws_dbg("mask decoding; i=%d toDecode=%d\n", i, toDecode); + +-- +2.16.4 + |