linux.git/net/bridge, branch v2.6.35-rc4

bridge: fdb cleanup runs too often

2010-06-17T20:49:14+00:00

It is common in end-node, non STP bridges to set forwarding
delay to zero; which causes the forwarding database cleanup
to run every clock tick. Change to run only as soon as needed
or at next ageing timer interval which ever is sooner.

Use round_jiffies_up macro rather than attempting round up
by changing value.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

bridge: Fix OOM crash in deliver_clone

2010-06-16T04:43:07+00:00

The bridge multicast patches introduced an OOM crash in the forward
path, when deliver_clone fails to clone the skb.

Reported-by: Mark Wagner 
Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

sysfs: add struct file* to bin_attr callbacks

2010-05-21T16:37:31+00:00

This allows bin_attr->read,write,mmap callbacks to check file specific data
(such as inode owner) as part of any privilege validation.

Signed-off-by: Chris Wright 
Signed-off-by: Greg Kroah-Hartman

bridge: fix build for CONFIG_SYSFS disabled

2010-05-18T19:26:27+00:00

Fix build when CONFIG_SYSFS is not enabled:
net/bridge/br_if.c:136: error: 'struct net_bridge_port' has no member named 'sysfs_name'

Note: dev->name == sysfs_name except when change name is in
progress, and we are protected from that by RTNL mutex.

Signed-off-by: Randy Dunlap 
Acked-by: Stephen Hemminger 
Signed-off-by: David S. Miller

bridge: update sysfs link names if port device names have changed

2010-05-16T06:10:15+00:00

Links for each port are created in sysfs using the device
name, but this could be changed after being added to the
bridge.

As well as being unable to remove interfaces after this
occurs (because userspace tools don't recognise the new
name, and the kernel won't recognise the old name), adding
another interface with the old name to the bridge will
cause an error trying to create the sysfs link.

This fixes the problem by listening for NETDEV_CHANGENAME
notifications and renaming the link.

https://bugzilla.kernel.org/show_bug.cgi?id=12743

Signed-off-by: Simon Arlott 
Acked-by: Stephen Hemminger 
Signed-off-by: David S. Miller

bridge: change console message interface

2010-05-16T06:10:02+00:00

Use one set of macro's for all bridge messages.

Note: can't use netdev_XXX macro's because bridge is purely
virtual and has no device parent.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

bridge: netpoll cleanup

2010-05-16T06:10:01+00:00

Move code around so that the ifdef for NETPOLL_CONTROLLER don't have to
show up in main code path. The control functions should be in helpers
that are only compiled if needed.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

netfilter: bridge-netfilter: fix crash in br_nf_forward_finish()

2010-05-13T12:55:34+00:00

[ 4593.956206] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
[ 4593.956219] IP: [] br_nf_forward_finish+0x154/0x170 [bridge]
[ 4593.956232] PGD 195ece067 PUD 1ba005067 PMD 0
[ 4593.956241] Oops: 0000 [#1] SMP
[ 4593.956248] last sysfs file:
/sys/devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:08/ATK0110:00/hwmon/hwmon0/temp2_label
[ 4593.956253] CPU 3
...
[ 4593.956380] Pid: 29512, comm: kvm Not tainted 2.6.34-rc7-net #195 P6T DELUXE/System Product Name
[ 4593.956384] RIP: 0010:[]  [] br_nf_forward_finish+0x154/0x170 [bridge]
[ 4593.956395] RSP: 0018:ffff880001e63b78  EFLAGS: 00010246
[ 4593.956399] RAX: 0000000000000608 RBX: ffff880057181700 RCX: ffff8801b813d000
[ 4593.956402] RDX: 0000000000000000 RSI: 0000000000000002 RDI: ffff880057181700
[ 4593.956406] RBP: ffff880001e63ba8 R08: ffff8801b9d97000 R09: ffffffffa0335650
[ 4593.956410] R10: 0000000000000000 R11: 0000000000000000 R12: ffff8801b813d000
[ 4593.956413] R13: ffffffff81ab3940 R14: ffff880057181700 R15: 0000000000000002
[ 4593.956418] FS:  00007fc40d380710(0000) GS:ffff880001e60000(0000) knlGS:0000000000000000
[ 4593.956422] CS:  0010 DS: 002b ES: 002b CR0: 000000008005003b
[ 4593.956426] CR2: 0000000000000018 CR3: 00000001ba1d7000 CR4: 00000000000026e0
[ 4593.956429] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 4593.956433] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
[ 4593.956437] Process kvm (pid: 29512, threadinfo ffff8801ba566000, task ffff8801b8003870)
[ 4593.956441] Stack:
[ 4593.956443]  0000000100000020 ffff880001e63ba0 ffff880001e63ba0 ffff880057181700
[ 4593.956451] <0> ffffffffa0335650 ffffffff81ab3940 ffff880001e63bd8 ffffffffa03350e6
[ 4593.956462] <0> ffff880001e63c40 000000000000024d ffff880057181700 0000000080000000
[ 4593.956474] Call Trace:
[ 4593.956478]  
[ 4593.956488]  [] ? br_nf_forward_finish+0x0/0x170 [bridge]
[ 4593.956496]  [] NF_HOOK_THRESH+0x56/0x60 [bridge]
[ 4593.956504]  [] br_nf_forward_arp+0x112/0x120 [bridge]
[ 4593.956511]  [] nf_iterate+0x64/0xa0
[ 4593.956519]  [] ? br_forward_finish+0x0/0x60 [bridge]
[ 4593.956524]  [] nf_hook_slow+0x6c/0x100
[ 4593.956531]  [] ? br_forward_finish+0x0/0x60 [bridge]
[ 4593.956538]  [] ? __br_forward+0x0/0xc0 [bridge]
[ 4593.956545]  [] __br_forward+0x6d/0xc0 [bridge]
[ 4593.956550]  [] ? skb_clone+0x3e/0x70
[ 4593.956557]  [] deliver_clone+0x32/0x60 [bridge]
[ 4593.956564]  [] br_flood+0xa6/0xe0 [bridge]
[ 4593.956571]  [] ? __br_forward+0x0/0xc0 [bridge]

Don't call nf_bridge_update_protocol() for ARP traffic as skb->nf_bridge isn't
used in the ARP case.

Reported-by: Stephen Hemminger 
Signed-off-by: Bart De Schuymer 
Signed-off-by: Patrick McHardy

Merge branch 'master' of git://dev.medozas.de/linux

2010-05-11T16:59:21+00:00

netfilter: xtables: change hotdrop pointer to direct modification

2010-05-11T16:35:27+00:00

Since xt_action_param is writable, let's use it. The pointer to
'bool hotdrop' always worried (8 bytes (64-bit) to write 1 byte!).
Surprisingly results in a reduction in size:

   text    data     bss filename
5457066  692730  357892 vmlinux.o-prev
5456554  692730  357892 vmlinux.o

Signed-off-by: Jan Engelhardt