frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix byte swapping of XF86VidMode{Get,Set}GammaRamp 

Fixes OpenSolaris Bug 8315:
Xorg segfaults when screensaver fades in cross-endian xdmcp session
<http://defect.opensolaris.org/bz/show_bug.cgi?id=8315>

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
This commit is contained in:
Alan Coopersmith 2009-04-23 08:42:38 -07:00
parent 932d6bcbb6
commit 7d0f7518c2
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/xfree86/dixmods/extmod/xf86vmode.c
View File

@ -1541,6 +1541,7 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client)
{ {
CARD16 *ramp = NULL; CARD16 *ramp = NULL;
int n, length, i; int n, length, i;
size_t ramplen;
xXF86VidModeGetGammaRampReply rep; xXF86VidModeGetGammaRampReply rep;
REQUEST(xXF86VidModeGetGammaRampReq); REQUEST(xXF86VidModeGetGammaRampReq);
@ -1555,7 +1556,8 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client)
length = (stuff->size + 1) & ~1; length = (stuff->size + 1) & ~1;
if(stuff->size) { if(stuff->size) {
if(!(ramp = xalloc(length * 3 * sizeof(CARD16)))) ramplen = length * 3 * sizeof(CARD16);
if (!(ramp = xalloc(ramplen)))
return BadAlloc; return BadAlloc;
if (!VidModeGetGammaRamp(stuff->screen, stuff->size, if (!VidModeGetGammaRamp(stuff->screen, stuff->size,
@ -1573,13 +1575,12 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client)
swaps(&rep.sequenceNumber, n); swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n); swapl(&rep.length, n);
swaps(&rep.size, n); swaps(&rep.size, n);
for(i = 0; i < length * 3; i++) SwapShorts(ramp, length * 3);
swaps(&ramp[i],n);
} }
WriteToClient(client, sizeof(xXF86VidModeGetGammaRampReply), (char *)&rep); WriteToClient(client, sizeof(xXF86VidModeGetGammaRampReply), (char *)&rep);
if(stuff->size) { if(stuff->size) {
WriteToClient(client, rep.length << 2, (char*)ramp); WriteToClient(client, ramplen, (char*)ramp);
xfree(ramp); xfree(ramp);
} }
@ -2060,7 +2061,6 @@ SProcXF86VidModeGetGamma(ClientPtr client)
static int static int
SProcXF86VidModeSetGammaRamp(ClientPtr client) SProcXF86VidModeSetGammaRamp(ClientPtr client)
{ {
CARD16 *ramp;
int length, n; int length, n;
REQUEST(xXF86VidModeSetGammaRampReq); REQUEST(xXF86VidModeSetGammaRampReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
@ -2069,11 +2069,7 @@ SProcXF86VidModeSetGammaRamp(ClientPtr client)
swaps(&stuff->screen, n); swaps(&stuff->screen, n);
length = ((stuff->size + 1) & ~1) * 6; length = ((stuff->size + 1) & ~1) * 6;
REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length); REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
ramp = (CARD16*)&stuff[1]; SwapRestS(stuff);
while(length--) {
swaps(ramp, n);
ramp++;
}
return ProcXF86VidModeSetGammaRamp(client); return ProcXF86VidModeSetGammaRamp(client);
} }