Re: [Patch resend nf] ipvs: fix AF assignment in ip_vs_conn_new()

[Julian Anastasov <ja@xxxxxx>]

        Hello,

On Wed, 29 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()).
> 
> Signed-off-by: Bogdano Arendartchuk <barendartchuk@xxxxxxxx>
> Signed-off-by: Michal Kubecek <mkubecek@xxxxxxx>
> ---
> (first time it didn't reach all recipients due to a malformed header)
> ---
>  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..282b39b 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, vaddr);

        Patch does not compile due to vaddr and p->daddr
usage but you are in the right direction. Such change should
fix a problem where connection templates don't get full
IPv6 address for the real server, only the first 4 bytes
are copied and as result it works only for IPv4.

> +     cp->vport          = p->vport;
> +     ip_vs_addr_set(p->af, &cp->daddr, p->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