lkml.org 
[lkml]   [2013]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 45/66] netfilter: nf_conntrack: fix rt6i_gateway checks for H.323 helper
    Date
    3.11-stable review patch.  If anyone has any objections, please let me know.

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

    From: Julian Anastasov <ja@ssi.bg>

    [ Upstream commit 56e42441ed54b092d6c7411138ce60d049e7c731 ]

    Now when rt6_nexthop() can return nexthop address we can use it
    for proper nexthop comparison of directly connected destinations.
    For more information refer to commit bbb5823cf742a7
    ("netfilter: nf_conntrack: fix rt_gateway checks for H.323 helper").

    Signed-off-by: Julian Anastasov <ja@ssi.bg>
    Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/netfilter/nf_conntrack_h323_main.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/net/netfilter/nf_conntrack_h323_main.c
    +++ b/net/netfilter/nf_conntrack_h323_main.c
    @@ -778,8 +778,8 @@ static int callforward_do_filter(const u
    flowi6_to_flowi(&fl1), false)) {
    if (!afinfo->route(&init_net, (struct dst_entry **)&rt2,
    flowi6_to_flowi(&fl2), false)) {
    - if (!memcmp(&rt1->rt6i_gateway, &rt2->rt6i_gateway,
    - sizeof(rt1->rt6i_gateway)) &&
    + if (ipv6_addr_equal(rt6_nexthop(rt1),
    + rt6_nexthop(rt2)) &&
    rt1->dst.dev == rt2->dst.dev)
    ret = 1;
    dst_release(&rt2->dst);



    \
     
     \ /
      Last update: 2013-11-02 00:01    [W:4.255 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site