aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-09-15 02:39:20 -0700
committerDavid S. Miller <davem@davemloft.net>2009-09-15 02:39:20 -0700
commit29a020d35f629619c67fa5e32acaaac3f8a1ba90 (patch)
tree65f9ce8a822633aa1e6cdf25be3aa258d2d21db1
parent75c78500ddad74b229cd0691496b8549490496a2 (diff)
downloadmrst-s0i3-test-29a020d35f629619c67fa5e32acaaac3f8a1ba90.tar.gz
mrst-s0i3-test-29a020d35f629619c67fa5e32acaaac3f8a1ba90.tar.xz
mrst-s0i3-test-29a020d35f629619c67fa5e32acaaac3f8a1ba90.zip
[PATCH] net: kmemcheck annotation in struct socket
struct socket has a 16 bit hole that triggers kmemcheck warnings. As suggested by Ingo, use kmemcheck annotations Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/net.h5
-rw-r--r--net/socket.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/net.h b/include/linux/net.h
index 4fc2ffd527f..9040a10584f 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -57,6 +57,7 @@ typedef enum {
#include <linux/random.h>
#include <linux/wait.h>
#include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */
+#include <linux/kmemcheck.h>
struct poll_table_struct;
struct pipe_inode_info;
@@ -127,7 +128,11 @@ enum sock_shutdown_cmd {
*/
struct socket {
socket_state state;
+
+ kmemcheck_bitfield_begin(type);
short type;
+ kmemcheck_bitfield_end(type);
+
unsigned long flags;
/*
* Please keep fasync_list & wait fields in the same cache line
diff --git a/net/socket.c b/net/socket.c
index 6d471655904..2a022c00d85 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -489,6 +489,7 @@ static struct socket *sock_alloc(void)
sock = SOCKET_I(inode);
+ kmemcheck_annotate_bitfield(sock, type);
inode->i_mode = S_IFSOCK | S_IRWXUGO;
inode->i_uid = current_fsuid();
inode->i_gid = current_fsgid();