| Message ID | 20090918005708.25594.52575.stgit@localhost.localdomain |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Thu, 17 Sep 2009 17:57:09 -0700 > From: John Fastabend <john.r.fastabend@intel.com> > > The rmem_alloc and omem_alloc socket fields are not > initialized. This sets each variable to zero when a socket > is created. Note the sk_wmem_alloc is already initialized > in sock_init_data. > > Signed-off-by: John Fastabend <john.r.fastabend@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> It's set to zero implicitly by the memset() done at sock_alloc() time. Re-setting it again here explicitly will just add unnecessary memory traffic. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index c5aab6a..4e673d2 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -423,6 +423,9 @@ static int __netlink_create(struct net *net, struct socket *sock, } init_waitqueue_head(&nlk->wait); + atomic_set(&sk->sk_rmem_alloc, 0); + atomic_set(&sk->sk_omem_alloc, 0); + sk->sk_destruct = netlink_sock_destruct; sk->sk_protocol = protocol; return 0;