drivers/net/wireless/libertas/scan.c | 4 +--
net/core/dev.c | 27 +++++--------------------
net/core/rtnetlink.c | 2 -
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +
net/ipv4/netfilter/nf_nat_snmp_basic.c | 1
net/ipv6/tcp_ipv6.c | 2 -
net/netfilter/xt_iprange.c | 8 +++----
7 files changed, 17 insertions(+), 29 deletions(-)
New commits:
commit 59f9905a8d7a3db33b7927dad47ca6fc1dc26755
Author: Patrick McHardy <[EMAIL PROTECTED]>
Date: Wed Oct 22 19:41:31 2008 +0200
netfilter: restore lost ifdef guarding defrag exception
netfilter: restore lost #ifdef guarding defrag exception
Upstream commit 38f7ac3eb:
Nir Tzachar <[EMAIL PROTECTED]> reported a warning when sending
fragments over loopback with NAT:
[ 6658.338121] WARNING: at net/ipv4/netfilter/nf_nat_standalone.c:89
nf_nat_fn+0x33/0x155()
The reason is that defragmentation is skipped for already tracked
connections.
This is wrong in combination with NAT and ip_conntrack actually had some
ifdefs
to avoid this behaviour when NAT is compiled in.
The entire "optimization" may seem a bit silly, for now simply restoring the
lost #ifdef is the easiest solution until we can come up with something
better.
Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
commit cb55b25f160f3b1c8c494759d778531e56bf9c5f
Author: Ilpo Järvinen <[EMAIL PROTECTED]>
Date: Wed Oct 22 19:41:29 2008 +0200
netfilter: snmp nat leaks memory in case of failure
netfilter: snmp nat leaks memory in case of failure
Upstream commit 311670f3e:
Signed-off-by: Ilpo Jarvinen <[EMAIL PROTECTED]>
Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
commit adaee298306dd68d30579839e94114391a1388c6
Author: Alexey Dobriyan <[EMAIL PROTECTED]>
Date: Wed Oct 22 19:41:28 2008 +0200
netfilter: xt_iprange: fix range inversion match
netfilter: xt_iprange: fix range inversion match
Upstream commit 6def1eb48:
Inverted IPv4 v1 and IPv6 v0 matches don't match anything since 2.6.25-rc1!
Signed-off-by: Alexey Dobriyan <[EMAIL PROTECTED]>
Acked-by: Jan Engelhardt <[EMAIL PROTECTED]>
Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
commit 06da28f2e3d331a1abb7517b967bb109edd1e515
Author: Ilpo Järvinen <[EMAIL PROTECTED]>
Date: Wed Oct 8 14:36:33 2008 -0700
tcpv6: fix option space offsets with md5
[ Upstream commit 53b125779fb0b29e5b316bf3dc7d199e6dcea567 ]
More breakage :-), part of timestamps just were previously
overwritten.
Signed-off-by: Ilpo Järvinen <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
commit 8b53b6bb9aef388ce53a7cddec454be2f8400254
Author: Herbert Xu <[EMAIL PROTECTED]>
Date: Tue Oct 7 15:50:03 2008 -0700
net: Fix netdev_run_todo dead-lock
[ Upstream commit 58ec3b4db9eb5a28e3aec5f407a54e28f7039c19 ]
Benjamin Thery tracked down a bug that explains many instances
of the error
unregister_netdevice: waiting for %s to become free. Usage count = %d
It turns out that netdev_run_todo can dead-lock with itself if
a second instance of it is run in a thread that will then free
a reference to the device waited on by the first instance.
The problem is really quite silly. We were trying to create
parallelism where none was required. As netdev_run_todo always
follows a RTNL section, and that todo tasks can only be added
with the RTNL held, by definition you should only need to wait
for the very ones that you've added and be done with it.
There is no need for a second mutex or spinlock.
This is exactly what the following patch does.
Signed-off-by: Herbert Xu <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
commit bdeee2143cd54a153f63d3378b8263e932c645a0
Author: Johannes Berg <[EMAIL PROTECTED]>
Date: Sun Nov 2 19:30:21 2008 +0000
libertas: fix buffer overrun
commit 48735d8d8bd701b1e0cd3d49c21e5e385ddcb077 upstream
If somebody sends an invalid beacon/probe response, that can trash the
whole BSS descriptor. The descriptor is, luckily, large enough so that
it cannot scribble past the end of it; it's well above 400 bytes long.
Signed-off-by: Johannes Berg <[EMAIL PROTECTED]>
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=59f9905a8d7a3db33b7927dad47ca6fc1dc26755
http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=cb55b25f160f3b1c8c494759d778531e56bf9c5f
http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=adaee298306dd68d30579839e94114391a1388c6
http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=06da28f2e3d331a1abb7517b967bb109edd1e515
http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=8b53b6bb9aef388ce53a7cddec454be2f8400254
http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=bdeee2143cd54a153f63d3378b8263e932c645a0
_______________________________________________
svn mailing list
[email protected]
http://mailman.vyatta.com/mailman/listinfo/svn
