[GIT] Networking

David Miller
2011-12-28T03:50:17Z

1) AF_PACKET bind() can leak a netdevice reference, from Wei Yongjun.

2) netem erroneously calls vfree() under spinlock and soft interrupt
disable, fix from Eric Dumazet.

3) ctnetlink_get_expect() can make nfnetlink loop forever when it
returns -EAGAIN in situations where it should not, fix from
Pablo Neira Ayuso.

4) Autoloading connection tracking helpers cannot be done with
spinlocks held because that operation sleeps, fix also from Pablo.

Please pull, thanks a lot!

The following changes since commit 6fd8fb7f55cb6d45e7f078cd0eaf7e3c243f6c33:

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 (2011-12-26 12:46:17 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master

David S. Miller (1):
Merge branch 'nf' of git://1984.lsi.us.es/net

Eric Dumazet (1):
netem: dont call vfree() under spinlock and BH disabled

Pablo Neira Ayuso (2):
netfilter: ctnetlink: fix return value of ctnetlink_get_expect()
netfilter: ctnetlink: fix scheduling while atomic if helper is autoloaded

Wei Yongjun (1):
packet: fix possible dev refcnt leak when bind fail

net/netfilter/nf_conntrack_netlink.c | 18 +++++++++++++-----
net/packet/af_packet.c | 6 +++++-
net/sched/sch_netem.c | 7 ++++---
3 files changed, 22 insertions(+), 9 deletions(-)