[X2Go-Commits] [nx-libs] 05/06: Revert "dix: integer overflow in GetHosts() [CVE-2014-8092 2/4]"

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 03a2922d9cc17af26bd91d4a471061c54db50789
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 16 05:55:23 2015 +0100

    Revert "dix: integer overflow in GetHosts() [CVE-2014-8092 2/4]"
    
    This reverts commit d4c76981f7fddb364166464c571ed8d3de3086cd.
---
 nx-X11/programs/Xserver/os/access.c |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c
index 0e9d138..b6a70a7 100644
--- a/nx-X11/programs/Xserver/os/access.c
+++ b/nx-X11/programs/Xserver/os/access.c
@@ -1719,10 +1719,6 @@ GetHosts (
     {
 	nHosts++;
 	n += (((host->len + 3) >> 2) << 2) + sizeof(xHostEntry);
-        /* Could check for INT_MAX, but in reality having more than 1mb of
-           hostnames in the access list is ridiculous */
-        if (n >= 1048576)
-            break;
     }
     if (n)
     {
@@ -1734,8 +1730,6 @@ GetHosts (
         for (host = validhosts; host; host = host->next)
 	{
 	    len = host->len;
-            if ((ptr + sizeof(xHostEntry) + len) > (data + n))
-                break;
 	    ((xHostEntry *)ptr)->family = host->family;
 	    ((xHostEntry *)ptr)->length = len;
 	    ptr += sizeof(xHostEntry);

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git