netlink: don't orphan skb in netlink_trim() · 1298ca4671 - Gogs

netlink: don't orphan skb in netlink_trim()

Netlink doesn't account skbs to the sending socket, so the there's no
need to orphan the skb before trimming it.

Removing the skb_orphan() call is required for mmap'ed netlink, which uses
a netlink specific skb destructor that must not be invoked before the
final freeing of the skb.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Patrick McHardy 12 years ago

parent

0ebd0ac5ff

commit

1298ca4671

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
net/netlink/af_netlink.c
							 
								View File
							
				@@ -851,7 +851,7 @@ static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
			
				 {
			
				 	int delta;
			
				-	skb_orphan(skb);
			
				+	WARN_ON(skb->sk != NULL);
			
				 	delta = skb->end - skb->tail;
			
				 	if (delta * 2 < skb->truesize)