commit c52a3f89f882b84fc422000655c023fe73e701cf
author Thomas Graf <tgraf@suug.ch> Sat Jun 18 22:51:26 2005 -0700
committer David S. Miller <davem@davemloft.net> Sat Jun 18 22:51:26 2005 -0700
tree 25069c0f52b19bc0ffef80aa0cb41193e0a483f6
parent 88121aea7bdb5fdc527388e262381829c4e1db16

[NETLINK]: Fix RTA_NEST_CANCEL().

Only skb_trim() if 'start' is non-NULL.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

include/linux/rtnetlink.h

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 5a5cda1..6fff8c4 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -924,7 +924,8 @@
 	(skb)->len; })
 
 #define RTA_NEST_CANCEL(skb, start) \
-({	skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
+({	if (start) \
+		skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
 	-1; })
 
 #define RTA_GET_U32(rta) \