LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

Re: [PATCH nf v2] ipvs: fix AF assignment in ip_vs_conn_new()

To: Michal Kubecek <mkubecek@xxxxxxx>
Subject: Re: [PATCH nf v2] ipvs: fix AF assignment in ip_vs_conn_new()
Cc: netfilter-devel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, lvs-devel@xxxxxxxxxxxxxxx, Wensong Zhang <wensong@xxxxxxxxxxxx>, Simon Horman <horms@xxxxxxxxxxxx>, Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>, Patrick McHardy <kaber@xxxxxxxxx>, Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx>, "David S. Miller" <davem@xxxxxxxxxxxxx>
From: Julian Anastasov <ja@xxxxxx>
Date: Thu, 30 Jan 2014 10:29:22 +0200 (EET)
        Hello,

On Thu, 30 Jan 2014, Michal Kubecek wrote:

> If a fwmark is passed to ip_vs_conn_new(), it is passed in
> vaddr, not daddr. Therefore we should set AF to AF_UNSPEC in
> vaddr assignment (like we do in ip_vs_ct_in_get()), otherwise we
> may copy only first 4 bytes of an IPv6 address into cp->daddr.
> 
> v2: fix messed up {d,v}addr and p->{d,v}addr, add info about the
> outcome (thanks to Julian Anastasov)
> 
> Signed-off-by: Bogdano Arendartchuk <barendartchuk@xxxxxxxx>
> Signed-off-by: Michal Kubecek <mkubecek@xxxxxxx>

Acked-by: Julian Anastasov <ja@xxxxxx>

        Looks like problem comes from
commit be8be9eccbf2d908a7e56b3f7a71105cd88da06b
"ipvs: Fix IPv4 FWMARK virtual services" (2.6.30).

> ---
>  net/netfilter/ipvs/ip_vs_conn.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
> index 59a1a85..a8eb0a8 100644
> --- a/net/netfilter/ipvs/ip_vs_conn.c
> +++ b/net/netfilter/ipvs/ip_vs_conn.c
> @@ -871,11 +871,11 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
>       cp->protocol       = p->protocol;
>       ip_vs_addr_set(p->af, &cp->caddr, p->caddr);
>       cp->cport          = p->cport;
> -     ip_vs_addr_set(p->af, &cp->vaddr, p->vaddr);
> -     cp->vport          = p->vport;
> -     /* proto should only be IPPROTO_IP if d_addr is a fwmark */
> +     /* proto should only be IPPROTO_IP if p->vaddr is a fwmark */
>       ip_vs_addr_set(p->protocol == IPPROTO_IP ? AF_UNSPEC : p->af,
> -                    &cp->daddr, daddr);
> +                    &cp->vaddr, p->vaddr);
> +     cp->vport          = p->vport;
> +     ip_vs_addr_set(p->af, &cp->daddr, daddr);
>       cp->dport          = dport;
>       cp->flags          = flags;
>       cp->fwmark         = fwmark;
> -- 
> 1.8.1.4

Regards

--
Julian Anastasov <ja@xxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

<Prev in Thread] Current Thread [Next in Thread>