[PATCH] xselinux: Fix GetDrawableContext
Eamon Walsh
ewalsh at tycho.nsa.gov
Fri Jan 21 18:05:19 PST 2011
Reviewed-by: Eamon Walsh <ewalsh at tycho.nsa.gov>
This should go as a bugfix on release branches; I'll take care of that after it goes in. Thanks!
On 01/20/2011 11:01 PM, Adam Jackson wrote:
> M_DRAWABLE_PIXMAP is the lookup mask to dixLookupDrawable, and _not_ the
> type value in the drawable itself.
>
> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
> Xext/xselinux_ext.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
> index 93c1b59..374571c 100644
> --- a/Xext/xselinux_ext.c
> +++ b/Xext/xselinux_ext.c
> @@ -231,13 +231,11 @@ ProcSELinuxGetDrawableContext(ClientPtr client)
> REQUEST(SELinuxGetContextReq);
> REQUEST_SIZE_MATCH(SELinuxGetContextReq);
>
> - rc = dixLookupDrawable(&pDraw, stuff->id, client,
> - M_WINDOW | M_DRAWABLE_PIXMAP,
> - DixGetAttrAccess);
> + rc = dixLookupDrawable(&pDraw, stuff->id, client, 0, DixGetAttrAccess);
> if (rc != Success)
> return rc;
>
> - if (pDraw->type == M_DRAWABLE_PIXMAP)
> + if (pDraw->type == DRAWABLE_PIXMAP)
> privatePtr = &((PixmapPtr)pDraw)->devPrivates;
> else
> privatePtr = &((WindowPtr)pDraw)->devPrivates;
--
Eamon Walsh
National Security Agency
More information about the xorg-devel
mailing list