提交 · 41d0cdedd5d0a067069a1559315aa9bfdf00794a · openeuler / Kernel

01 2月, 2008 40 次提交

[NETFILTER]: nfnetlink_log: fix typo · 41d0cded

由 Patrick McHardy 提交于 1月 31, 2008

It should use htonl for the GID, not htons.
Signed-off-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

41d0cded

linux/types.h: Use __u64 for aligned_u64 · c82a5cb8

由 Jan Engelhardt 提交于 1月 31, 2008

Signed-off-by: NJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

c82a5cb8

[NETFILTER]: bridge netfilter: remove nf_bridge_info read-only netoutdev member · 2fd8e526

由 Patrick McHardy 提交于 1月 31, 2008

Before the removal of the deferred output hooks, netoutdev was used in
case of VLANs on top of a bridge to store the VLAN device, so the
deferred hooks would see the correct output device. This isn't
necessary anymore since we're calling the output hooks for the correct
device directly in the IP stack.
Signed-off-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

2fd8e526

[NETFILTER]: nf_nat: remove double bysource hash initialization · d44caf88

由 Patrick McHardy 提交于 1月 31, 2008

The hash table is already initialized by nf_ct_alloc_hashtable().
Signed-off-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

d44caf88

[NETFILTER]: Use const in struct xt_match, xt_target, xt_table · ecb6f85e

由 Jan Engelhardt 提交于 1月 31, 2008

Signed-off-by: NJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

ecb6f85e

[NETFILTER]: Supress some sparse warnings · ca7c48ca

由 Eric Dumazet 提交于 1月 31, 2008

CHECK net/netfilter/nf_conntrack_expect.c
net/netfilter/nf_conntrack_expect.c:429:13: warning: context imbalance in 'exp_seq_start' - wrong count at exit
net/netfilter/nf_conntrack_expect.c:441:13: warning: context imbalance in 'exp_seq_stop' - unexpected unlock
CHECK net/netfilter/nf_log.c
net/netfilter/nf_log.c:105:13: warning: context imbalance in 'seq_start' - wrong count at exit
net/netfilter/nf_log.c:125:13: warning: context imbalance in 'seq_stop' - unexpected unlock
CHECK net/netfilter/nfnetlink_queue.c
net/netfilter/nfnetlink_queue.c:363:7: warning: symbol 'size' shadows an earlier one
net/netfilter/nfnetlink_queue.c:217:9: originally declared here
net/netfilter/nfnetlink_queue.c:847:13: warning: context imbalance in 'seq_start' - wrong count at exit
net/netfilter/nfnetlink_queue.c:859:13: warning: context imbalance in 'seq_stop' - unexpected unlock
Signed-off-by: NEric Dumazet <dada1@cosmosbay.com>
Signed-off-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

ca7c48ca

[RAW]: Wrong content of the /proc/net/raw6. · 3046d767

由 Denis V. Lunev 提交于 1月 31, 2008

The address of IPv6 raw sockets was shown in the wrong format, from
IPv4 ones.  The problem has been introduced by the commit
42a73808 ("[RAW]: Consolidate proc
interface.")

Thanks to Adrian Bunk who originally noticed the problem.
Signed-off-by: NDenis V. Lunev <den@openvz.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

3046d767

[RAW]: Cleanup IPv4 raw_seq_show. · 8cd850ef

由 Denis V. Lunev 提交于 1月 31, 2008

There is no need to use 128 bytes on the stack at all. Clean the code
in the IPv6 style.
Signed-off-by: NDenis V. Lunev <den@openvz.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

8cd850ef

[RAW]: Family check in the /proc/net/raw[6] is extra. · 377cf82d

由 Denis V. Lunev 提交于 1月 31, 2008

Different hashtables are used for IPv6 and IPv4 raw sockets, so no
need to check the socket family in the iterator over hashtables. Clean
this out.
Signed-off-by: NDenis V. Lunev <den@openvz.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

377cf82d

[IPCOMP]: Fix reception of incompressible packets · b1641064

由 Herbert Xu 提交于 1月 30, 2008

I made a silly typo by entering IPPROTO_IP (== 0) instead of
IPPROTO_IPIP (== 4).  This broke the reception of incompressible
packets.
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

b1641064

[NET]: should explicitely initialize atomic_t field in struct dst_ops · e2422970

由 Eric Dumazet 提交于 1月 30, 2008

All but one struct dst_ops static initializations miss explicit
initialization of entries field.

As this field is atomic_t, we should use ATOMIC_INIT(0), and not
rely on atomic_t implementation.
Signed-off-by: NEric Dumazet <dada1@cosmosbay.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

e2422970

[TCP]: NewReno must count every skb while marking losses · ad1984e8

由 Ilpo Järvinen 提交于 1月 30, 2008

NewReno should add cnt per skb (as with FACK) instead of depending on
SACKED_ACKED bits which won't be set with it at all.  Effectively,
NewReno should always exists after the first iteration anyway (or
immediately if there's already head in lost_out.

This was fixed earlier in net-2.6.25 but got reverted among other
stuff and I didn't notice that this is still necessary (actually
wasn't even considering this case while trying to figure out the
reports because I lived with different kind of code than it in reality
was).

This should solve the WARN_ONs in TCP code that as a result of this
triggered multiple times in every place we check for this invariant.

Special thanks to Dave Young <hidave.darkstar@gmail.com> and Krishna
Kumar2 <krkumar2@in.ibm.com> for trying with my debug patches.
Signed-off-by: NIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Tested-by: NDave Young <hidave.darkstar@gmail.com>
Tested-by: NKrishna Kumar2 <krkumar2@in.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

ad1984e8

[NETNS]: Fix race between put_net() and netlink_kernel_create(). · 23fe1866

由 Pavel Emelyanov 提交于 1月 30, 2008

The comment about "race free view of the set of network
namespaces" was a bit hasty. Look (there even can be only
one CPU, as discovered by Alexey Dobriyan and Denis Lunev):

put_net()
  if (atomic_dec_and_test(&net->refcnt))
    /* true */
      __put_net(net);
        queue_work(...);

/*
 * note: the net now has refcnt 0, but still in
 * the global list of net namespaces
 */

== re-schedule ==

register_pernet_subsys(&some_ops);
  register_pernet_operations(&some_ops);
    (*some_ops)->init(net);
      /*
       * we call netlink_kernel_create() here
       * in some places
       */
      netlink_kernel_create();
         sk_alloc();
            get_net(net); /* refcnt = 1 */
         /*
          * now we drop the net refcount not to
          * block the net namespace exit in the
          * future (or this can be done on the
          * error path)
          */
         put_net(sk->sk_net);
             if (atomic_dec_and_test(&...))
                   /*
                    * true. BOOOM! The net is
                    * scheduled for release twice
                    */

When thinking on this problem, I decided, that getting and
putting the net in init callback is wrong. If some init
callback needs to have a refcount-less reference on the struct
net, _it_ has to be careful himself, rather than relying on
the infrastructure to handle this correctly.

In case of netlink_kernel_create(), the problem is that the
sk_alloc() gets the given namespace, but passing the info
that we don't want to get it inside this call is too heavy.

Instead, I propose to crate the socket inside an init_net
namespace and then re-attach it to the desired one right
after the socket is created.

After doing this, we also have to be careful on error paths
not to drop the reference on the namespace, we didn't get
the one on.
Signed-off-by: NPavel Emelyanov <xemul@openvz.org>
Acked-by: NDenis Lunev <den@openvz.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

23fe1866

[XFRM]: constify 'struct xfrm_type' · 533cb5b0

由 Eric Dumazet 提交于 1月 30, 2008

Signed-off-by: NEric Dumazet <dada1@cosmosbay.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

533cb5b0

[NETNS]: Add missing initialization of nl_info.nl_net in rtm_to_fib6_config() · 2216b483

由 Benjamin Thery 提交于 1月 30, 2008

Add missing initialization of the new nl_info.nl_net field in
rtm_to_fib6_config(). This will be needed the store network namespace
associated to the fib6_config struct.
Signed-off-by: NBenjamin Thery <benjamin.thery@bull.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

2216b483

[NET]: Introducing socket mark socket option. · 4a19ec58

由 Laszlo Attila Toth 提交于 1月 30, 2008

A userspace program may wish to set the mark for each packets its send
without using the netfilter MARK target. Changing the mark can be used
for mark based routing without netfilter or for packet filtering.

It requires CAP_NET_ADMIN capability.
Signed-off-by: NLaszlo Attila Toth <panther@balabit.hu>
Acked-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

4a19ec58

[AF_RXRPC]: constify function pointer tables · 036c2e27

由 Jan Engelhardt 提交于 1月 30, 2008

Signed-off-by: NJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

036c2e27

[BNX2]: Update version to 1.7.3. · 18c0226e