X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2FCVE-2014-8xxx%2F0011-dri3-unvalidated-lengths-in-DRI3-extension-swapped-p.patch;h=8ac8d1602dc5ee183137a426c06708837c2bd64c;hp=d8f4b658d181fe393705a6a696723a6d5fec8187;hb=4db25562fe97995f20b8adc0f2e6959ed82e8635;hpb=7217e0ca50bba73dad94782e67980aeeb24ab693

diff --git a/debian/patches/CVE-2014-8xxx/0011-dri3-unvalidated-lengths-in-DRI3-extension-swapped-p.patch b/debian/patches/CVE-2014-8xxx/0011-dri3-unvalidated-lengths-in-DRI3-extension-swapped-p.patch
index d8f4b65..8ac8d16 100644
--- a/debian/patches/CVE-2014-8xxx/0011-dri3-unvalidated-lengths-in-DRI3-extension-swapped-p.patch
+++ b/debian/patches/CVE-2014-8xxx/0011-dri3-unvalidated-lengths-in-DRI3-extension-swapped-p.patch
@@ -10,11 +10,9 @@ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
  dri3/dri3_request.c |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: xorg-server-1.15.1/dri3/dri3_request.c
-===================================================================
---- xorg-server-1.15.1.orig/dri3/dri3_request.c	2014-12-04 11:53:23.380277861 -0500
-+++ xorg-server-1.15.1/dri3/dri3_request.c	2014-12-04 11:53:23.376277836 -0500
-@@ -311,6 +311,7 @@
+--- a/dri3/dri3_request.c
++++ b/dri3/dri3_request.c
+@@ -311,6 +311,7 @@ static int
  sproc_dri3_query_version(ClientPtr client)
  {
      REQUEST(xDRI3QueryVersionReq);
@@ -22,7 +20,7 @@ Index: xorg-server-1.15.1/dri3/dri3_request.c
  
      swaps(&stuff->length);
      swapl(&stuff->majorVersion);
-@@ -322,6 +323,7 @@
+@@ -322,6 +323,7 @@ static int
  sproc_dri3_open(ClientPtr client)
  {
      REQUEST(xDRI3OpenReq);
@@ -30,7 +28,7 @@ Index: xorg-server-1.15.1/dri3/dri3_request.c
  
      swaps(&stuff->length);
      swapl(&stuff->drawable);
-@@ -333,6 +335,7 @@
+@@ -333,6 +335,7 @@ static int
  sproc_dri3_pixmap_from_buffer(ClientPtr client)
  {
      REQUEST(xDRI3PixmapFromBufferReq);
@@ -38,7 +36,7 @@ Index: xorg-server-1.15.1/dri3/dri3_request.c
  
      swaps(&stuff->length);
      swapl(&stuff->pixmap);
-@@ -348,6 +351,7 @@
+@@ -348,6 +351,7 @@ static int
  sproc_dri3_buffer_from_pixmap(ClientPtr client)
  {
      REQUEST(xDRI3BufferFromPixmapReq);
@@ -46,7 +44,7 @@ Index: xorg-server-1.15.1/dri3/dri3_request.c
  
      swaps(&stuff->length);
      swapl(&stuff->pixmap);
-@@ -358,6 +362,7 @@
+@@ -358,6 +362,7 @@ static int
  sproc_dri3_fence_from_fd(ClientPtr client)
  {
      REQUEST(xDRI3FenceFromFDReq);
@@ -54,7 +52,7 @@ Index: xorg-server-1.15.1/dri3/dri3_request.c
  
      swaps(&stuff->length);
      swapl(&stuff->drawable);
-@@ -369,6 +374,7 @@
+@@ -369,6 +374,7 @@ static int
  sproc_dri3_fd_from_fence(ClientPtr client)
  {
      REQUEST(xDRI3FDFromFenceReq);