lkml.org 
[lkml]   [2021]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 027/146] net/sched: act_ct: handle DNAT tuple collision
    Date
    From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>

    [ Upstream commit 13c62f5371e3eb4fc3400cfa26e64ca75f888008 ]

    This this the counterpart of 8aa7b526dc0b ("openvswitch: handle DNAT
    tuple collision") for act_ct. From that commit changelog:

    """
    With multiple DNAT rules it's possible that after destination
    translation the resulting tuples collide.

    ...

    Netfilter handles this case by allocating a null binding for SNAT at
    egress by default. Perform the same operation in openvswitch for DNAT
    if no explicit SNAT is requested by the user and allocate a null binding
    for SNAT for packets in the "original" direction.
    """

    Fixes: 95219afbb980 ("act_ct: support asymmetric conntrack")
    Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/sched/act_ct.c | 21 +++++++++++++--------
    1 file changed, 13 insertions(+), 8 deletions(-)

    diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
    index 315a5b2f3add..7ef074c6dd16 100644
    --- a/net/sched/act_ct.c
    +++ b/net/sched/act_ct.c
    @@ -900,14 +900,19 @@ static int tcf_ct_act_nat(struct sk_buff *skb,
    }

    err = ct_nat_execute(skb, ct, ctinfo, range, maniptype);
    - if (err == NF_ACCEPT &&
    - ct->status & IPS_SRC_NAT && ct->status & IPS_DST_NAT) {
    - if (maniptype == NF_NAT_MANIP_SRC)
    - maniptype = NF_NAT_MANIP_DST;
    - else
    - maniptype = NF_NAT_MANIP_SRC;
    -
    - err = ct_nat_execute(skb, ct, ctinfo, range, maniptype);
    + if (err == NF_ACCEPT && ct->status & IPS_DST_NAT) {
    + if (ct->status & IPS_SRC_NAT) {
    + if (maniptype == NF_NAT_MANIP_SRC)
    + maniptype = NF_NAT_MANIP_DST;
    + else
    + maniptype = NF_NAT_MANIP_SRC;
    +
    + err = ct_nat_execute(skb, ct, ctinfo, range,
    + maniptype);
    + } else if (CTINFO2DIR(ctinfo) == IP_CT_DIR_ORIGINAL) {
    + err = ct_nat_execute(skb, ct, ctinfo, NULL,
    + NF_NAT_MANIP_SRC);
    + }
    }
    return err;
    #else
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-06-21 18:26    [W:4.033 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site