patch-2.1.27 linux/net/ipx/af_ipx.c

• Lines: 69
• Date: Tue Feb 25 17:12:51 1997
• Orig file: v2.1.26/linux/net/ipx/af_ipx.c
• Orig date: Fri Feb 7 05:54:55 1997

diff -u --recursive --new-file v2.1.26/linux/net/ipx/af_ipx.c linux/net/ipx/af_ipx.c
@@ -1721,7 +1721,7 @@
 
 	sk=sock->sk;
 
-	if (optval==NULL)
+	if (optlen!=sizeof(int))
 		return(-EINVAL);
 
 	err = get_user(opt, (unsigned int *)optval);
@@ -1737,12 +1737,12 @@
 					sk->protinfo.af_ipx.type=opt;
 					return 0;
 				default:
-					return -EOPNOTSUPP;
+					return -ENOPROTOOPT;
 			}
 			break;
 
 		default:
-			return -EOPNOTSUPP;
+			return -ENOPROTOOPT;
 	}
 }
 
@@ -1751,7 +1751,7 @@
 {
 	struct sock *sk;
 	int val=0;
-	int err;
+	int len;
 
 	sk=sock->sk;
 
@@ -1770,17 +1770,16 @@
 			break;
 
 		default:
-			return -EOPNOTSUPP;
+			return -ENOPROTOOPT;
 	}
-	err = put_user(sizeof(int), optlen);
-	if (!err)
-		err = put_user(val, (int *)optval);
-	return err;
-}
-
-static int ipx_listen(struct socket *sock, int backlog)
-{
-	return -EOPNOTSUPP;
+	if(get_user(len,optlen))
+		return -EFAULT;
+	len=min(len,sizeof(int));
+	if(put_user(len, optlen))
+		return -EFAULT;
+	if(copy_to_user(optval,&val,len))
+		return -EFAULT;
+	return 0;
 }
 
 static int ipx_create(struct socket *sock, int protocol)
@@ -2334,7 +2333,7 @@
 	ipx_getname,
 	datagram_poll,
 	ipx_ioctl,
-	ipx_listen,
+	sock_no_listen,
 	ipx_shutdown,
 	ipx_setsockopt,
 	ipx_getsockopt,