svn commit: branches/uClibc_0_9_28/libc/inet

[andersen at uclibc.org]

Author: andersen
Date: 2007-02-01 16:27:53 -0800 (Thu, 01 Feb 2007)
New Revision: 17703

Log:
Ronald Maeder <Ron at zing.net> writes:

Hi Erik,

Thanks for all your great work.  I found a set of bugs in
resolv.c .  Basically, there is code that looks like:

        BIGLOCK;
        __nameserversXX=__nameservers;
        __nameserverXX=__nameserver;
        BIGUNLOCK;
        i = __dns_lookup(dname, type, __nameserversXX, __nameserverXX, &packet, &a);

which is a problem because the declarations are

int __nameservers;
char * __nameserver[MAX_SERVERS];
int __searchdomains;
char * __searchdomain[MAX_SEARCH];

so you can see that __nameserver is a pointer.  Copying the
pointer to __nameserverXX doesn't protect the global variable
space.  I have attached a patch and the new file.  I hope you
will incorporate these bug fixes.  I spent quite a bit of time
tracking them down.

Many thanks,

Ron



Modified:
   branches/uClibc_0_9_28/libc/inet/resolv.c


Changeset:
Modified: branches/uClibc_0_9_28/libc/inet/resolv.c
===================================================================
--- branches/uClibc_0_9_28/libc/inet/resolv.c	2007-02-02 00:25:22 UTC (rev 17702)
+++ branches/uClibc_0_9_28/libc/inet/resolv.c	2007-02-02 00:27:53 UTC (rev 17703)
@@ -695,7 +695,11 @@
 		++local_id;
 		local_id &= 0xffff;
 		h.id = local_id;
+		BIGLOCK;
+		/* this is really __nameserver[] which is a global that
+		   needs a lock!! */
 		dns = nsip[local_ns];
+		BIGUNLOCK;
 
 		h.qdcount = 1;
 		h.rd = 1;
@@ -730,7 +734,11 @@
 				retries+1, NAMESERVER_PORT, dns);
 
 #ifdef __UCLIBC_HAS_IPV6__
+		BIGLOCK;
+		/* 'dns' is really __nameserver[] which is a global that
+		   needs a lock!! */
 		v6 = inet_pton(AF_INET6, dns, &sa6.sin6_addr) > 0;
+		BIGUNLOCK;
 		fd = socket(v6 ? AF_INET6 : AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 #else
 		fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -751,7 +759,11 @@
 #endif
 		    sa.sin_family = AF_INET;
 		    sa.sin_port = htons(NAMESERVER_PORT);
+		    BIGLOCK;
+		    /* 'dns' is really __nameserver[] which is a global that
+		       needs a lock!! */
 		    sa.sin_addr.s_addr = inet_addr(dns);
+		    BIGUNLOCK;
 		    rc = connect(fd, (struct sockaddr *) &sa, sizeof(sa));
 #ifdef __UCLIBC_HAS_IPV6__
 		}