patch-2.4.25 linux-2.4.25/net/atm/common.c

• Lines: 63
• Date: 2004-02-18 05:36:32.000000000 -0800
• Orig file: linux-2.4.24/net/atm/common.c
• Orig date: 2003-11-28 10:26:21.000000000 -0800

diff -urN linux-2.4.24/net/atm/common.c linux-2.4.25/net/atm/common.c
@@ -242,6 +242,8 @@
 		printk(KERN_DEBUG "vcc_sock_destruct: wmem leakage (%d bytes) detected.\n", atomic_read(&sk->wmem_alloc));
 
 	kfree(sk->protinfo.af_atm);
+
+	MOD_DEC_USE_COUNT;
 }
 
 int vcc_create(struct socket *sock, int protocol, int family)
@@ -282,6 +284,9 @@
 	sk->sleep = &vcc->sleep;
 	sk->destruct = vcc_sock_destruct;
 	sock->sk = sk;
+
+	MOD_INC_USE_COUNT;
+
 	return 0;
 }
 
@@ -510,9 +515,8 @@
  		return -EOPNOTSUPP;
   	vcc = ATM_SD(sock);
  	if (test_bit(ATM_VF_RELEASED,&vcc->flags) ||
- 	    test_bit(ATM_VF_CLOSE,&vcc->flags))
- 		return vcc->reply;
- 	if (!test_bit(ATM_VF_READY, &vcc->flags))
+ 	    test_bit(ATM_VF_CLOSE, &vcc->flags) ||
+ 	    !test_bit(ATM_VF_READY, &vcc->flags))
  		return 0;
  
  	skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &error);
@@ -568,12 +572,10 @@
   	size = m->msg_iov->iov_len;
   	vcc = ATM_SD(sock);
  	if (test_bit(ATM_VF_RELEASED, &vcc->flags) ||
- 	    test_bit(ATM_VF_CLOSE, &vcc->flags)) {
- 		error = vcc->reply;
- 		goto out;
- 	}
- 	if (!test_bit(ATM_VF_READY, &vcc->flags)) {
+ 	    test_bit(ATM_VF_CLOSE, &vcc->flags) ||
+ 	    !test_bit(ATM_VF_READY, &vcc->flags)) {
  		error = -EPIPE;
+ 		send_sig(SIGPIPE, current, 0);
  		goto out;
  	}
  	if (!size) {
@@ -601,12 +603,10 @@
 			break;
 		}
 		if (test_bit(ATM_VF_RELEASED,&vcc->flags) ||
-		    test_bit(ATM_VF_CLOSE,&vcc->flags)) {
-			error = vcc->reply;
-			break;
-		}
-		if (!test_bit(ATM_VF_READY,&vcc->flags)) {
+		    test_bit(ATM_VF_CLOSE, &vcc->flags) ||
+		    !test_bit(ATM_VF_READY, &vcc->flags)) {
 			error = -EPIPE;
+			send_sig(SIGPIPE, current, 0);
 			break;
 		}
 	}