diff options
author | Karl Tomlinson <xmail@karlt.net> | 2015-04-15 10:16:18 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-16 14:09:07 +0200 |
commit | ac9fbaabd6bdbca6dd1d94fa385aea41fdebf2c1 (patch) | |
tree | 01869c3f355fdbbc0af7a519032c96c24d3c8a06 /nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | |
parent | bad67799229b94ea2ba0174319949766ad1c2fc6 (diff) | |
download | nx-libs-ac9fbaabd6bdbca6dd1d94fa385aea41fdebf2c1.tar.gz nx-libs-ac9fbaabd6bdbca6dd1d94fa385aea41fdebf2c1.tar.bz2 nx-libs-ac9fbaabd6bdbca6dd1d94fa385aea41fdebf2c1.zip |
MakeBigReq: don't move the last word, already handled by Data32 (X.Org CVE-2013-7439).
MakeBigReq inserts a length field after the first 4 bytes of the request
(after req->length), pushing everything else back by 4 bytes.
The current memmove moves everything but the first 4 bytes back. If a
request aligns to the end of the buffer pointer when MakeBigReq is
invoked for that request, this runs over the buffer. Instead, we need to
memmove minus the first 4 bytes (which aren't moved), minus the last 4
bytes (so we still align to the previous tail).
The 4 bytes that fell out are already handled with Data32, which will
handle the buffermax correctly.
The case where req->length = 1 was already not functional.
Reported by Abhishek Arya <inferno@chromium.org> (against X.Org BTS).
https://bugzilla.mozilla.org/show_bug.cgi?id=803762
Reviewed-by: Jeff Muizelaar <jmuizelaar@mozilla.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Rebased-for-NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c')
0 files changed, 0 insertions, 0 deletions