From 69d41aee2b1ba76c39af1f2edc83e1e667bed209 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Tue, 30 Nov 2004 16:46:21 +0000 Subject: [PATCH] - 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. --- include/net/sock.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/net/sock.h b/include/net/sock.h index 0d3da11ec..a487663e0 100644 --- 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 -- 2.47.0