Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2aa3665 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: add kmemcheck annotation in __alloc_skb() 

pskb_expand_head() triggers a kmemcheck warning when copy of
skb_shared_info is done in pskb_expand_head()

This is because destructor_arg field is not necessarily initialized at
this point. Add kmemcheck_annotate_variable() call in __alloc_skb() to
instruct kmemcheck this is a normal situation.

Resolves bugzilla.kernel.org 27212

Reference: https://bugzilla.kernel.org/show_bug.cgi?id=27212


Reported-by: default avatarChristian Casteyde <casteyde.christian@free.fr>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
CC: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d3a9a68

net/core/skbuff.c

+1 −0
Original line number Diff line number Diff line
@@ -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;