Attachment 156875 Details for Bug 244026 – [NETLINK]: Unshare SKB, as necessary, in netlink_trim()

[patch] [NETLINK]: Unshare SKB, as necessary, in netlink_trim()

linux-2.6.9-netlink-unshare-skb.patch (text/plain), 1.60 KB, created by Chris Lalancette on 2007-06-13 13:36:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2007-06-13 13:36:04 UTC

Size: 1.60 KB

patch

obsolete

>diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
>index 83e1bf2..7f94408 100644
>--- a/net/netlink/af_netlink.c
>+++ b/net/netlink/af_netlink.c
>@@ -670,7 +670,7 @@ void netlink_detachskb(struct sock *sk, 
> 	sock_put(sk);
> }
> 
>-static inline void netlink_trim(struct sk_buff *skb, int allocation)
>+static inline struct sk_buff *netlink_trim(struct sk_buff *skb, int allocation)
> {
> 	int delta;
> 
>@@ -678,10 +678,20 @@ static inline void netlink_trim(struct s
> 
> 	delta = skb->end - skb->tail;
> 	if (delta * 2 < skb->truesize)
>-		return;
>-	if (pskb_expand_head(skb, 0, -delta, allocation))
>-		return;
>-	skb->truesize -= delta;
>+		return skb;
>+
>+	if (skb_shared(skb)) {
>+		struct sk_buff *nskb = skb_clone(skb, allocation);
>+		if (!nskb)
>+			return skb;
>+		kfree_skb(skb);
>+		skb = nskb;
>+	}
>+
>+	if (!pskb_expand_head(skb, 0, -delta, allocation))
>+		skb->truesize -= delta;
>+
>+	return skb;
> }
> 
> int netlink_unicast(struct sock *ssk, struct sk_buff *skb, u32 pid, int nonblock)
>@@ -690,7 +700,7 @@ int netlink_unicast(struct sock *ssk, st
> 	int err;
> 	long timeo;
> 
>-	netlink_trim(skb, gfp_any());
>+	skb = netlink_trim(skb, gfp_any());
> 
> 	timeo = sock_sndtimeo(ssk, nonblock);
> retry:
>@@ -788,6 +798,8 @@ int netlink_broadcast(struct sock *ssk, 
> 	struct hlist_node *node;
> 	struct sock *sk;
> 
>+	skb = netlink_trim(skb, allocation);
>+
> 	info.exclude_sk = ssk;
> 	info.pid = pid;
> 	info.group = group;
>@@ -798,8 +810,6 @@ int netlink_broadcast(struct sock *ssk, 
> 	info.skb = skb;
> 	info.skb2 = NULL;
> 
>-	netlink_trim(skb, allocation);
>-
> 	/* While we sleep in clone, do not allow to change socket list */
> 
> 	netlink_lock_table();

Actions: View | Diff

Attachments on bug 244026: 156871 | 156874 | 156875