diff --git a/[refs] b/[refs] index 17c364283bd9..fb26008ed4fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d3a9a685465986d7653c5abbc0b24681e7c44d7 +refs/heads/master: c2aa3665cf8510b1665ee2f5a9525cf7be6dec4f diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 7cd1bc86d591..d883dcc78b6b 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -210,6 +210,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, shinfo = skb_shinfo(skb); memset(shinfo, 0, offsetof(struct skb_shared_info, dataref)); atomic_set(&shinfo->dataref, 1); + kmemcheck_annotate_variable(shinfo->destructor_arg); if (fclone) { struct sk_buff *child = skb + 1;