linux-stable.git/net/core, branch v3.3.1

net: fix napi_reuse_skb() skb reserve

2012-04-02T17:32:23+00:00

[ Upstream commit 2a2a459eeeff48640dc557548ce576d666ab06ed ]

napi->skb is allocated in napi_get_frags() using
netdev_alloc_skb_ip_align(), with a reserve of NET_SKB_PAD +
NET_IP_ALIGN bytes.

However, when such skb is recycled in napi_reuse_skb(), it ends with a
reserve of NET_IP_ALIGN which is suboptimal.

Signed-off-by: Eric Dumazet 
Cc: Herbert Xu 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

rtnetlink: Fix VF IFLA policy

2012-04-02T17:31:53+00:00

commit 48752f6513012a1b078da08b145d5c40a644f058 upstream.

Add VF spoof check to IFLA policy.  The original patch I submitted to
add the spoof checking feature to rtnl failed to add the proper policy
rule that identifies the data type and len.  This patch corrects that
oversight.  No bugs have been reported against this but it may cause
some problem for the netlink message parsing that uses the policy
table.

Signed-off-by: Greg Rose 
Tested-by: Sibai Li 
Signed-off-by: Jeff Kirsher 
Signed-off-by: Greg Kroah-Hartman

rtnetlink: fix rtnl_calcit() and rtnl_dump_ifinfo()

2012-03-05T03:02:55+00:00

nlmsg_parse() might return an error, so test its return value before
potential random memory accesses.

Errors introduced in commit 115c9b81928 (rtnetlink: Fix problem with
buffer allocation)

Signed-off-by: Eric Dumazet 
Cc: Greg Rose 
Signed-off-by: David S. Miller

rtnetlink: Fix problem with buffer allocation

2012-02-21T21:56:45+00:00

Implement a new netlink attribute type IFLA_EXT_MASK.  The mask
is a 32 bit value that can be used to indicate to the kernel that
certain extended ifinfo values are requested by the user application.
At this time the only mask value defined is RTEXT_FILTER_VF to
indicate that the user wants the ifinfo dump to send information
about the VFs belonging to the interface.

This patch fixes a bug in which certain applications do not have
large enough buffers to accommodate the extra information returned
by the kernel with large numbers of SR-IOV virtual functions.
Those applications will not send the new netlink attribute with
the interface info dump request netlink messages so they will
not get unexpectedly large request buffers returned by the kernel.

Modifies the rtnl_calcit function to traverse the list of net
devices and compute the minimum buffer size that can hold the
info dumps of all matching devices based upon the filter passed
in via the new netlink attribute filter mask.  If no filter
mask is sent then the buffer allocation defaults to NLMSG_GOODSIZE.

With this change it is possible to add yet to be defined netlink
attributes to the dump request which should make it fairly extensible
in the future.

Signed-off-by: Greg Rose 
Signed-off-by: David S. Miller

neighbour: Fixed race condition at tbl->nht

2012-02-21T21:28:10+00:00

When the fixed race condition happens:

1. While function neigh_periodic_work scans the neighbor hash table
pointed by field tbl->nht, it unlocks and locks tbl->lock between
buckets in order to call cond_resched.

2. Assume that function neigh_periodic_work calls cond_resched, that is,
the lock tbl->lock is available, and function neigh_hash_grow runs.

3. Once function neigh_hash_grow finishes, and RCU calls
neigh_hash_free_rcu, the original struct neigh_hash_table that function
neigh_periodic_work was using doesn't exist anymore.

4. Once back at neigh_periodic_work, whenever the old struct
neigh_hash_table is accessed, things can go badly.

Signed-off-by: Michel Machado 
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

netpoll: netpoll_poll_dev() should access dev->flags

2012-02-14T20:24:26+00:00

commit 5a698af53f (bond: service netpoll arp queue on master device)
tested IFF_SLAVE flag against dev->priv_flags instead of dev->flags

Signed-off-by: Eric Dumazet 
Cc: WANG Cong 
Acked-by: Neil Horman 
Signed-off-by: David S. Miller

netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m

2012-02-10T20:08:57+00:00

When the netprio_cgroup module is not loaded, net_prio_subsys_id
is -1, and so sock_update_prioidx() accesses cgroup_subsys array
with negative index subsys[-1].

Make the code resembles cls_cgroup code, which is bug free.

Origionally-authored-by: Li Zefan 
Signed-off-by: Li Zefan 
Signed-off-by: Neil Horman 
CC: "David S. Miller" 
Signed-off-by: David S. Miller

netprio_cgroup: don't allocate prio table when a device is registered

2012-02-10T20:08:57+00:00

So we delay the allocation till the priority is set through cgroup,
and this makes skb_update_priority() faster when it's not set.

This also eliminates an off-by-one bug similar with the one fixed
in the previous patch.

Origionally-authored-by: Li Zefan 
Signed-off-by: Li Zefan 
Signed-off-by: Neil Horman 
CC: "David S. Miller" 
Signed-off-by: David S. Miller

netprio_cgroup: fix an off-by-one bug

2012-02-10T20:08:56+00:00

# mount -t cgroup xxx /mnt
  # mkdir /mnt/tmp
  # cat /mnt/tmp/net_prio.ifpriomap
  lo 0
  eth0 0
  virbr0 0
  # echo 'lo 999' > /mnt/tmp/net_prio.ifpriomap
  # cat /mnt/tmp/net_prio.ifpriomap
  lo 999
  eth0 0
  virbr0 4101267344

We got weired output, because we exceeded the boundary of the array.
We may even crash the kernel..

Origionally-authored-by: Li Zefan 
Signed-off-by: Li Zefan 
Signed-off-by: Neil Horman 
CC: "David S. Miller" 
Signed-off-by: David S. Miller

gro: more generic L2 header check

2012-02-08T23:26:54+00:00

Shlomo Pongratz reported GRO L2 header check was suited for Ethernet
only, and failed on IB/ipoib traffic.

He provided a patch faking a zeroed header to let GRO aggregates frames.

Roland Dreier, Herbert Xu, and others suggested we change GRO L2 header
check to be more generic, ie not assuming L2 header is 14 bytes, but
taking into account hard_header_len.

__napi_gro_receive() has special handling for the common case (Ethernet)
to avoid a memcmp() call and use an inline optimized function instead.

Signed-off-by: Eric Dumazet 
Reported-by: Shlomo Pongratz 
Cc: Roland Dreier 
Cc: Or Gerlitz 
Cc: Herbert Xu 
Tested-by: Sean Hefty 
Signed-off-by: David S. Miller