Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking changes from David Miller:
"Ok, we should be good to go now"
1) We have to statically initialize the init_net device list head rather
than do so in an initcall, otherwise netprio_cgroup crashes if it's
built statically rather than modular (Mark D. Rustad)
2) Fix SKB null oopser in CIPSO ipv4 option processing (Paul Moore)
3) Qlogic maintainers update (Anirban Chakraborty)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
net: Statically initialize init_net.dev_base_head
MAINTAINERS: Changes in qlcnic and qlge maintainers list
cipso: don't follow a NULL pointer when setsockopt() is called
+10
-6
+1
-2
MAINTAINERS
+1
-2
MAINTAINERS
···
5565
5565
F: drivers/net/ethernet/qlogic/qla3xxx.*
5566
5566
5567
5567
QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
5568
-
M: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
5568
+
M: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
5569
5569
M: Sony Chacko <sony.chacko@qlogic.com>
5570
5570
M: linux-driver@qlogic.com
5571
5571
L: netdev@vger.kernel.org
···
5573
5573
F: drivers/net/ethernet/qlogic/qlcnic/
5574
5574
5575
5575
QLOGIC QLGE 10Gb ETHERNET DRIVER
5576
-
M: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
5577
5576
M: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
5578
5577
M: Ron Mercer <ron.mercer@qlogic.com>
5579
5578
M: linux-driver@qlogic.com
+2
-1
net/core/dev.c
+2
-1
net/core/dev.c
···
6283
6283
/* Initialize per network namespace state */
6284
6284
static int __net_init netdev_init(struct net *net)
6285
6285
{
6286
-
INIT_LIST_HEAD(&net->dev_base_head);
6286
+
if (net != &init_net)
6287
+
INIT_LIST_HEAD(&net->dev_base_head);
6287
6288
6288
6289
net->dev_name_head = netdev_create_hash();
6289
6290
if (net->dev_name_head == NULL)
+3
-1
net/core/net_namespace.c
+3
-1
net/core/net_namespace.c
···
27
27
LIST_HEAD(net_namespace_list);
28
28
EXPORT_SYMBOL_GPL(net_namespace_list);
29
29
30
-
struct net init_net;
30
+
struct net init_net = {
31
+
.dev_base_head = LIST_HEAD_INIT(init_net.dev_base_head),
32
+
};
31
33
EXPORT_SYMBOL(init_net);
32
34
33
35
#define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */
+4
-2
net/ipv4/cipso_ipv4.c
+4
-2
net/ipv4/cipso_ipv4.c
···
1725
1725
case CIPSO_V4_TAG_LOCAL:
1726
1726
/* This is a non-standard tag that we only allow for
1727
1727
* local connections, so if the incoming interface is
1728
-
* not the loopback device drop the packet. */
1729
-
if (!(skb->dev->flags & IFF_LOOPBACK)) {
1728
+
* not the loopback device drop the packet. Further,
1729
+
* there is no legitimate reason for setting this from
1730
+
* userspace so reject it if skb is NULL. */
1731
+
if (skb == NULL || !(skb->dev->flags & IFF_LOOPBACK)) {
1730
1732
err_offset = opt_iter;
1731
1733
goto validate_return_locked;
1732
1734
}