Attachment 156874 Details for Bug 244026 – [NETLINK]: Orphan SKBs in netlink_trim().

[patch] [NETLINK]: Orphan SKBs in netlink_trim().

linux-2.6.9-netlink-orphan.patch (text/plain), 1.24 KB, created by Chris Lalancette on 2007-06-13 13:35:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2007-06-13 13:35:28 UTC

Size: 1.24 KB

patch

obsolete

>diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
>index a7e6c40..83e1bf2 100644
>--- a/net/netlink/af_netlink.c
>+++ b/net/netlink/af_netlink.c
>@@ -639,7 +639,6 @@ #endif
> 		}
> 		return 1;
> 	}
>-	skb_orphan(skb);
> 	skb_set_owner_r(skb, sk);
> 	return 0;
> }
>@@ -673,14 +672,11 @@ void netlink_detachskb(struct sock *sk, 
> 
> static inline void netlink_trim(struct sk_buff *skb, int allocation)
> {
>-	int delta = skb->end - skb->tail;
>+	int delta;
> 
>-	/* If the packet is charged to a socket, the modification
>-	 * of truesize below is illegal and will corrupt socket
>-	 * buffer accounting state.
>-	 */
>-	BUG_ON(skb->list != NULL);
>+	skb_orphan(skb);
> 
>+	delta = skb->end - skb->tail;
> 	if (delta * 2 < skb->truesize)
> 		return;
> 	if (pskb_expand_head(skb, 0, -delta, allocation))
>@@ -717,14 +713,12 @@ static __inline__ int netlink_broadcast_
> 	struct netlink_opt *nlk = nlk_sk(sk);
> #ifdef NL_EMULATE_DEV
> 	if (nlk->handler) {
>-		skb_orphan(skb);
> 		nlk->handler(sk->sk_protocol, skb);
> 		return 0;
> 	} else
> #endif
> 	if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf &&
> 	    !test_bit(0, &nlk->state)) {
>-                skb_orphan(skb);
> 		skb_set_owner_r(skb, sk);
> 		skb_queue_tail(&sk->sk_receive_queue, skb);
> 		sk->sk_data_ready(sk, skb->len);

Actions: View | Diff

Attachments on bug 244026: 156871 | 156874 | 156875