lkml.org 
[lkml]   [2010]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[45/66] net: blackhole route should always be recalculated
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------


    From: Jianzhao Wang <jianzhao.wang@6wind.com>

    [ Upstream commit ae2688d59b5f861dc70a091d003773975d2ae7fb ]

    Blackhole routes are used when xfrm_lookup() returns -EREMOTE (error
    triggered by IKE for example), hence this kind of route is always
    temporary and so we should check if a better route exists for next
    packets.
    Bug has been introduced by commit d11a4dc18bf41719c9f0d7ed494d295dd2973b92.

    Signed-off-by: Jianzhao Wang <jianzhao.wang@6wind.com>
    Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    net/ipv4/route.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    --- a/net/ipv4/route.c
    +++ b/net/ipv4/route.c
    @@ -2712,6 +2712,11 @@ slow_output:

    EXPORT_SYMBOL_GPL(__ip_route_output_key);

    +static struct dst_entry *ipv4_blackhole_dst_check(struct dst_entry *dst, u32 cookie)
    +{
    + return NULL;
    +}
    +
    static void ipv4_rt_blackhole_update_pmtu(struct dst_entry *dst, u32 mtu)
    {
    }
    @@ -2720,7 +2725,7 @@ static struct dst_ops ipv4_dst_blackhole
    .family = AF_INET,
    .protocol = cpu_to_be16(ETH_P_IP),
    .destroy = ipv4_dst_destroy,
    - .check = ipv4_dst_check,
    + .check = ipv4_blackhole_dst_check,
    .update_pmtu = ipv4_rt_blackhole_update_pmtu,
    .entries = ATOMIC_INIT(0),
    };



    \
     
     \ /
      Last update: 2010-10-22 20:51    [W:4.029 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site