patch-1.3.65 linux/net/unix/af_unix.c

Next file: linux/scripts/Configure
Previous file: linux/net/netrom/af_netrom.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.64/linux/net/unix/af_unix.c linux/net/unix/af_unix.c
@@ -313,7 +313,7 @@
 	sk->rcvbuf=SK_RMEM_MAX;
 	sk->sndbuf=SK_WMEM_MAX;
 	sk->allocation=GFP_KERNEL;
-	sk->inuse=0;
+	sk->users=0;
 	sk->bsdism=0;
 	sk->debug=0;
 	sk->prot=NULL;
@@ -728,7 +728,7 @@
 		if(msg->msg_accrightslen == sizeof(int)) {
 			int fd;
 
-			fd = get_user_long(msg->msg_accrights);
+			fd = get_user((int *) msg->msg_accrights);
 			filp = file_from_fd(fd);
 			if(!filp)
 				return -EBADF;
@@ -873,7 +873,7 @@
 		current->files->fd[slot] = filp;
 		FD_CLR(slot, &current->files->close_on_exec);
 		/* need verify area here? */
-		put_user_long(slot, uaddr);
+		put_user(slot, uaddr);
 		return 0;
 	} 
 	return -EMFILE;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this