From patchwork Wed May 16 19:35:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 159743 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 99C4AB6FAB for ; Thu, 17 May 2012 05:37:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964803Ab2EPThG (ORCPT ); Wed, 16 May 2012 15:37:06 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:54899 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964775Ab2EPThB (ORCPT ); Wed, 16 May 2012 15:37:01 -0400 Received: by pbbrp8 with SMTP id rp8so1521893pbb.19 for ; Wed, 16 May 2012 12:37:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=+Pqh8TGwG1WAD/74sS0cPqEbALGugtw+ICV+LKoe6ZQ=; b=a83NRakcmzZHePLrPJ0oBPUgUMzlu/cy4+ivgx/SWWN0jDXi7G4ma2e5067pyJMdaU GodcPMav0CwpPifOreco7fCfiTbr2QdRqOgT1E0XSL6iZI1TxpvcJM/meJeR/rR3ttj8 Pj2o4nEo1XyLdHlSMWcdQeoeq+Pqq5BODGq76vIyiYJgouA93dPjsrPKBPzRtB3/DNbg n0Itp1goKv5HYCJlxVaPbb4gMzh1CZRM/2T1cYOt/Z1YPwz6UdbuAFxXUFC/ynXxx7x3 Sy58XoscL6Lw88e08GfWYuoM+nuPcvBiB5s5/23zE3JmzGl+L0NdgxC98J92IuZnb0uh NYpQ== Received: by 10.50.213.71 with SMTP id nq7mr11196874igc.12.1337197020839; Wed, 16 May 2012 12:37:00 -0700 (PDT) Received: from localhost.localdomain (modemcable118.38-22-96.mc.videotron.ca. [96.22.38.118]) by mx.google.com with ESMTPS id fk6sm4270153igc.5.2012.05.16.12.36.57 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 May 2012 12:36:58 -0700 (PDT) From: Benjamin Poirier To: netdev@vger.kernel.org Cc: "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , linux-kernel@vger.kernel.org, Steffen Klassert Subject: [PATCH v3] xfrm: take iphdr size into account for esp payload size calculation Date: Wed, 16 May 2012 15:35:25 -0400 Message-Id: <1337196925-4919-1-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <20120514.183952.1459413342269893446.davem@davemloft.net> References: <20120514.183952.1459413342269893446.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Corrects the function that determines the esp payload size. The calculations done in esp4_get_mtu lead to overlength frames in transport mode for certain mtu values and suboptimal frames for others. According to what is done, mainly in esp_output(), net_header_len aka sizeof(struct iphdr) must be taken into account before doing the alignment calculation. Signed-off-by: Benjamin Poirier --- Changes since v2: * rename l3_adj to net_adj * fix indentation Changes since v1: * introduce l3_adj to preserve the same returned value as before for tunnel mode For example, with md5 AH and 3des ESP (transport mode): mtu = 1499 leads to FRAGFAILS mtu = 1500 the addition of padding in the esp header could be avoided Tested with * transport mode E * transport mode EA * transport mode E + ah * tunnel mode E Not tested with BEET, but it should be the same as transport mode draft-nikander-esp-beet-mode-03.txt Section 5.2: "The wire packet format is identical to the ESP transport mode" --- net/ipv4/esp4.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 89a47b3..cb982a6 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -459,28 +459,22 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu) struct esp_data *esp = x->data; u32 blksize = ALIGN(crypto_aead_blocksize(esp->aead), 4); u32 align = max_t(u32, blksize, esp->padlen); - u32 rem; - - mtu -= x->props.header_len + crypto_aead_authsize(esp->aead); - rem = mtu & (align - 1); - mtu &= ~(align - 1); + unsigned int net_adj; switch (x->props.mode) { - case XFRM_MODE_TUNNEL: - break; - default: case XFRM_MODE_TRANSPORT: - /* The worst case */ - mtu -= blksize - 4; - mtu += min_t(u32, blksize - 4, rem); - break; case XFRM_MODE_BEET: - /* The worst case. */ - mtu += min_t(u32, IPV4_BEET_PHMAXLEN, rem); + net_adj = sizeof(struct iphdr); break; + case XFRM_MODE_TUNNEL: + net_adj = 0; + break; + default: + BUG(); } - return mtu - 2; + return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) - + net_adj) & ~(align - 1)) + (net_adj - 2); } static void esp4_err(struct sk_buff *skb, u32 info)