From patchwork Tue Nov 4 10:24:51 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 7079 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 44551DDDEE for ; Tue, 4 Nov 2008 21:26:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753034AbYKDK0o (ORCPT ); Tue, 4 Nov 2008 05:26:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750943AbYKDK0n (ORCPT ); Tue, 4 Nov 2008 05:26:43 -0500 Received: from moog.chdir.org ([88.191.42.160]:33045 "EHLO moog.chdir.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750733AbYKDK0m (ORCPT ); Tue, 4 Nov 2008 05:26:42 -0500 Received: from [2001:7a8:78df:2:20d:93ff:fe55:8f78] (helo=localhost.localdomain) by moog.chdir.org with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1KxJ7L-0000dc-GN; Tue, 04 Nov 2008 11:26:35 +0100 X-Hashcash: 1:20:081104:davem@davemloft.net::A9K8hXSuhd+RyeY6:00000000000000000000000000000000000000000000aA X-Hashcash: 1:20:081104:netdev@vger.kernel.org::wJ69e1dIksSlAa8g:0000000000000000000000000000000000000000zbR X-Hashcash: 1:20:081104:herbert@gondor.apana.org.au::dg5duymku4570ehm:0000000000000000000000000000000000HmmV X-Hashcash: 1:20:081104:andreas.steffen@strongswan.org::p+wCzZchqkEU4z+C:00000000000000000000000000000000CKR X-Hashcash: 1:20:081104:martin@strongswan.org::9psUGcSVXSXhrPFa:00000000000000000000000000000000000000000nEP From: arno@natisbad.org (Arnaud Ebalard) To: David Miller Cc: netdev@vger.kernel.org, Herbert Xu , Andreas Steffen , Martin Willi Subject: [PATCH] Have af-specific init_tempsel() initialize family field of temporary selector X-PGP-Key-URL: http://natisbad.org/arno@natisbad.org.asc X-Fingerprint: 47EB 85FE B99A AB85 FD09 46F3 0255 957C 047A 5026 Date: Tue, 04 Nov 2008 11:24:51 +0100 Message-ID: <87hc6npz4c.fsf@natisbad.org> User-Agent: Gnus/5.110009 (No Gnus v0.9) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, While adding MIGRATE support to strongSwan, Andreas Steffen noticed that the selectors provided in XFRM_MSG_ACQUIRE have their family field uninitialized (those in MIGRATE do have their family set). Looking at the code, this is because the af-specific init_tempsel() (called via afinfo->init_tempsel() in xfrm_init_tempsel()) do not set the value. Even if current apps probably do not rely on it, is there any argument for not doing it or is it just an omission? The patch below is more for discussion than anything else. Cheers, a+ Reported-by: Andreas Steffen Signed-off-by: Arnaud Ebalard Acked-by: Herbert Xu --- net/ipv4/xfrm4_state.c | 1 + net/ipv6/xfrm6_state.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c index 07735ed..55dc6be 100644 --- a/net/ipv4/xfrm4_state.c +++ b/net/ipv4/xfrm4_state.c @@ -33,6 +33,7 @@ __xfrm4_init_tempsel(struct xfrm_state *x, struct flowi *fl, x->sel.dport_mask = htons(0xffff); x->sel.sport = xfrm_flowi_sport(fl); x->sel.sport_mask = htons(0xffff); + x->sel.family = AF_INET; x->sel.prefixlen_d = 32; x->sel.prefixlen_s = 32; x->sel.proto = fl->proto; diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c index 89884a4..60c78cf 100644 --- a/net/ipv6/xfrm6_state.c +++ b/net/ipv6/xfrm6_state.c @@ -34,6 +34,7 @@ __xfrm6_init_tempsel(struct xfrm_state *x, struct flowi *fl, x->sel.dport_mask = htons(0xffff); x->sel.sport = xfrm_flowi_sport(fl); x->sel.sport_mask = htons(0xffff); + x->sel.family = AF_INET6; x->sel.prefixlen_d = 128; x->sel.prefixlen_s = 128; x->sel.proto = fl->proto;