From: David S. Miller Date: Wed, 20 Apr 2016 19:32:54 +0000 (-0400) Subject: net: nla_align_64bit() needs to test the right pointer. X-Git-Tag: v4.7-rc1~154^2~238 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e6f268ef3687862b0e9f01f7b3706b54f75b82ab;p=karo-tx-linux.git net: nla_align_64bit() needs to test the right pointer. Netlink messages are appended, one object at a time, to the end of the SKB. Therefore we need to test skb_tail_pointer() not skb->data for alignment. Fixes: 35c5845957c7 ("net: Add helpers for 64-bit aligning netlink attributes.") Signed-off-by: David S. Miller --- diff --git a/include/net/netlink.h b/include/net/netlink.h index cf95df1fa14b..3c1fd92a52c8 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h @@ -1250,7 +1250,7 @@ static inline int nla_align_64bit(struct sk_buff *skb, int padattr) * nlattr header for next attribute, will make nla_data() * 8-byte aligned. */ - if (IS_ALIGNED((unsigned long)skb->data, 8) && + if (IS_ALIGNED((unsigned long)skb_tail_pointer(skb), 8) && !nla_reserve(skb, padattr, 0)) return -EMSGSIZE; #endif