- merge revision 1.14

date: 2004/11/30 16:32:22;  author: mlhuang;  state: Exp;  lines: +1 -2
- return -EPERM instead of silently freeing
----------------------------
- merge revision 1.13
date: 2004/11/30 15:59:12;  author: mef;  state: Exp;  lines: +4 -1
PL3069

Fixed memory leak of skbuff.  Requires changes to accurately do statistics
and some additional cosmetic changes.  But this should be sufficient for
the next release candidate.

diff --git a/include/net/sock.h b/include/net/sock.h
index 0d3da11..a487663 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1086,8 +1086,10 @@ static inline int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
         * packet.
         */
        if (inet_stream_ops.bind != inet_bind &&
-           (int) sk->sk_xid > 0 && sk->sk_xid != skb->xid)
+           (int) sk->sk_xid > 0 && sk->sk_xid != skb->xid) {
+               err = -EPERM;
                goto out;
+       }
 
        /* Cast skb->rcvbuf to unsigned... It's pointless, but reduces
           number of warnings when compiling with -W --ANK