From patchwork Wed Jan 29 14:54:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kubecek X-Patchwork-Id: 315077 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 599AA2C00BB for ; Thu, 30 Jan 2014 01:54:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752360AbaA2Oyk (ORCPT ); Wed, 29 Jan 2014 09:54:40 -0500 Received: from cantor2.suse.de ([195.135.220.15]:52617 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751853AbaA2Oyj (ORCPT ); Wed, 29 Jan 2014 09:54:39 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 722C0AC75; Wed, 29 Jan 2014 14:54:38 +0000 (UTC) Received: by unicorn.suse.cz (Postfix, from userid 1000) id 69F56E916F; Wed, 29 Jan 2014 15:54:37 +0100 (CET) From: Michal Kubecek Subject: [Patch resend nf] ipvs: fix AF assignment in ip_vs_conn_new() To: netfilter-devel@vger.kernel.org Cc: netdev@vger.kernel.org, lvs-devel@vger.kernel.org, Wensong Zhang , Simon Horman , Julian Anastasov , Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik , "David S. Miller" Message-Id: <20140129145437.69F56E916F@unicorn.suse.cz> Date: Wed, 29 Jan 2014 15:54:37 +0100 (CET) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Michal Kubecek --- (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); + cp->vport = p->vport; + ip_vs_addr_set(p->af, &cp->daddr, p->daddr); cp->dport = dport; cp->flags = flags; cp->fwmark = fwmark;