Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 9ff1b54908f3..51b09a1f46c3 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -242,7 +242,8 @@ __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags)
         nlh->nlmsg_flags = flags;
         nlh->nlmsg_pid = pid;
         nlh->nlmsg_seq = seq;
-        memset(NLMSG_DATA(nlh) + len, 0, NLMSG_ALIGN(size) - size);
+        if (!__builtin_constant_p(size) || NLMSG_ALIGN(size) - size != 0)
+                memset(NLMSG_DATA(nlh) + len, 0, NLMSG_ALIGN(size) - size);
         return nlh;
 }