linux-stable.git/net/mpls, branch linux-4.3.y

mpls: fix mpls_net_init memory leak

2015-08-31T19:45:09+00:00

Fix a memory leak in the mpls netns init function in case of failure. If
register_net_sysctl fails then we need to free the ctl_table.

Fixes: 7720c01f3f59 ("mpls: Add a sysctl to control the size of the mpls label table")
Signed-off-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller

lwt: Add cfg argument to build_state

2015-08-24T17:34:40+00:00

Add cfg and family arguments to lwt build state functions. cfg is a void
pointer and will either be a pointer to a fib_config or fib6_config
structure. The family parameter indicates which one (either AF_INET
or AF_INET6).

LWT encpasulation implementation may use the fib configuration to build
the LWT state.

Signed-off-by: Tom Herbert 
Signed-off-by: David S. Miller

route: move lwtunnel state to dst_entry

2015-08-20T22:42:36+00:00

Currently, the lwtunnel state resides in per-protocol data. This is
a problem if we encapsulate ipv6 traffic in an ipv4 tunnel (or vice versa).
The xmit function of the tunnel does not know whether the packet has been
routed to it by ipv4 or ipv6, yet it needs the lwtstate data. Moving the
lwtstate data to dst_entry makes such inter-protocol tunneling possible.

As a bonus, this brings a nice diffstat.

Signed-off-by: Jiri Benc 
Acked-by: Roopa Prabhu 
Acked-by: Thomas Graf 
Signed-off-by: David S. Miller

mpls: Enforce payload type of traffic sent using explicit NULL

2015-08-10T05:51:42+00:00

RFC 4182 s2 states that if an IPv4 Explicit NULL label is the only
label on the stack, then after popping the resulting packet must be
treated as a IPv4 packet and forwarded based on the IPv4 header. The
same is true for IPv6 Explicit NULL with an IPv6 packet following.

Therefore, when installing the IPv4/IPv6 Explicit NULL label routes,
add an attribute that specifies the expected payload type for use at
forwarding time for determining the type of the encapsulated packet
instead of inspecting the first nibble of the packet.

Signed-off-by: Robert Shearman 
Signed-off-by: David S. Miller

af_mpls: add null dev check in find_outdev

2015-08-07T05:03:58+00:00

This patch adds null dev check for the 'cfg->rc_via_table ==
NEIGH_LINK_TABLE or dev_get_by_index() failed' case

Reported-by: Dan Carpenter 
Signed-off-by: Roopa Prabhu 
Signed-off-by: David S. Miller

mpls: small cleanup in inet/inet6_fib_lookup_dev()

2015-08-07T04:56:55+00:00

We recently changed this code from returning NULL to returning ERR_PTR.
There are some left over NULL assignments which we can remove.  We can
preserve the error code from ip_route_output() instead of always
returning -ENODEV.  Also these functions use a mix of gotos and direct
returns.  There is no cleanup necessary so I changed the gotos to
direct returns.

Signed-off-by: Dan Carpenter 
Acked-by: Roopa Prabhu 
Acked-by: Robert Shearman 
Signed-off-by: David S. Miller

mpls: Use definition for reserved label checks

2015-08-04T05:35:00+00:00

In multiple locations there are checks for whether the label in hand
is a reserved label or not using the arbritray value of 16. Factor
this out into a #define for better maintainability and for
documentation.

Signed-off-by: Robert Shearman 
Acked-by: Roopa Prabhu 
Signed-off-by: David S. Miller

af_mpls: fix undefined reference to ip6_route_output

2015-07-31T22:21:30+00:00

Undefined reference to ip6_route_output and ip_route_output
was reported with CONFIG_INET=n and CONFIG_IPV6=n.

This patch uses ipv6_stub_impl.ipv6_dst_lookup instead of
ip6_route_output. And wraps affected code under
IS_ENABLED(CONFIG_INET) and IS_ENABLED(CONFIG_IPV6).

Reported-by: kbuild test robot 
Reported-by: Thomas Graf 
Signed-off-by: Roopa Prabhu 
Signed-off-by: David S. Miller

mpls_iptunnel: fix sparse warn: remove incorrect rcu_dereference

2015-07-22T17:50:23+00:00

fix for:
net/mpls/mpls_iptunnel.c:73:19: sparse: incompatible types in comparison
expression (different address spaces)

remove incorrect rcu_dereference possibly left over from
earlier revisions of the code.

Reported-by: kbuild test robot 
Signed-off-by: Roopa Prabhu 
Signed-off-by: David S. Miller

mpls: make RTA_OIF optional

2015-07-22T05:27:19+00:00

If user did not specify an oif, try and get it from the via address.
If failed to get device, return with -ENODEV.

Signed-off-by: Roopa Prabhu 
Signed-off-by: David S. Miller