patch-2.1.43 linux/net/socket.c

• Lines: 32
• Date: Thu Jun 12 16:22:11 1997
• Orig file: v2.1.42/linux/net/socket.c
• Orig date: Thu May 15 16:48:07 1997

diff -u --recursive --new-file v2.1.42/linux/net/socket.c linux/net/socket.c
@@ -212,7 +212,7 @@
 		file->f_flags = O_RDWR;
 		file->f_inode = inode;
 		if (inode) 
-			inode->i_count++;
+			atomic_inc(&inode->i_count);
 		file->f_pos = 0;
 	}
 	return fd;
@@ -797,6 +797,7 @@
 	int len;
 
 	lock_kernel();
+restart:
   	if ((sock = sockfd_lookup(fd, &err))!=NULL)
   	{
 		if (!(newsock = sock_alloc())) 
@@ -834,7 +835,13 @@
 	
 		if (upeer_sockaddr)
 		{
-			newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 1);
+			/* Handle the race where the accept works and we
+			   then getname after it has closed again */
+			if(newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 1)<0)
+			{
+				sys_close(err);
+				goto restart;
+			}
 			move_addr_to_user(address,len, upeer_sockaddr, upeer_addrlen);
 		}
 out: