---

yaml --- r: 151474 b: refs/heads/master c: a98b65a h: refs/heads/master v: v3
git-mirror · Jun 15, 2009 · 5e36848 · 5e36848
1 parent 6561f4c
commit 5e36848
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c53bd2e1949ddbe06fe2a6079c0658d58ce25edb
+refs/heads/master: a98b65a3ad71e702e760bc63f57684301628e837
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
@@ -218,9 +218,11 @@ struct sock {
 #define sk_hash			__sk_common.skc_hash
 #define sk_prot			__sk_common.skc_prot
 #define sk_net			__sk_common.skc_net
+	kmemcheck_bitfield_begin(flags);
 	unsigned char		sk_shutdown : 2,
 				sk_no_check : 2,
 				sk_userlocks : 4;
+	kmemcheck_bitfield_end(flags);
 	unsigned char		sk_protocol;
 	unsigned short		sk_type;
 	int			sk_rcvbuf;

diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -941,6 +941,8 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority,
 		sk = kmalloc(prot->obj_size, priority);
 
 	if (sk != NULL) {
+		kmemcheck_annotate_bitfield(sk, flags);
+
 		if (security_sk_alloc(sk, family, priority))
 			goto out_free;