patch-2.2.18 linux/net/x25/af_x25.c

• Lines: 42
• Date: Tue Sep 26 21:50:14 2000
• Orig file: v2.2.17/net/x25/af_x25.c
• Orig date: Fri Apr 21 12:47:17 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/net/x25/af_x25.c linux/net/x25/af_x25.c
@@ -16,7 +16,10 @@
  *	X.25 001	Jonathan Naylor	Started coding.
  *	X.25 002	Jonathan Naylor	Centralised disconnect handling.
  *					New timer architecture.
- *	2000-11-03	Henner Eisen	MSG_EOR handling more POSIX compliant.
+ *	2000-03-11	Henner Eisen	MSG_EOR handling more POSIX compliant.
+ *	2000-08-27	Arnaldo C. Melo s/suser/capable/
+ *	2000-04-09	Henner Eisen	Set sock->state in x25_accept().
+ *					Fixed x25_output() related skb leakage.
  */
 
 #include <linux/config.h>
@@ -726,6 +729,7 @@
 	kfree_skb(skb);
 	sk->ack_backlog--;
 	newsock->sk = newsk;
+	newsock->state = SS_CONNECTED;
 
 	return 0;
 }
@@ -971,7 +975,11 @@
 	if (msg->msg_flags & MSG_OOB) {
 		skb_queue_tail(&sk->protinfo.x25->interrupt_out_queue, skb);
 	} else {
-		x25_output(sk, skb);
+		err = x25_output(sk, skb);
+		if(err){
+			len = err;
+			kfree_skb(skb);
+		}
 	}
 
 	x25_kick(sk);
@@ -1116,7 +1124,7 @@
 			return x25_subscr_ioctl(cmd, (void *)arg);
 
 		case SIOCX25SSUBSCRIP:
-			if (!suser()) return -EPERM;
+			if (!capable(CAP_NET_ADMIN)) return -EPERM;
 			return x25_subscr_ioctl(cmd, (void *)arg);
 
 		case SIOCX25GFACILITIES: {