From patchwork Fri Dec 9 20:29:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Owens X-Patchwork-Id: 130466 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 BADD71007D7 for ; Sat, 10 Dec 2011 07:29:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754790Ab1LIU3L (ORCPT ); Fri, 9 Dec 2011 15:29:11 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:65006 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752704Ab1LIU3J (ORCPT ); Fri, 9 Dec 2011 15:29:09 -0500 Received: by ghbz2 with SMTP id z2so2850203ghb.19 for ; Fri, 09 Dec 2011 12:29:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=+LrnRnl31EFmbe4nreErLB8OnybTs8UbxPoahgXbGrU=; b=KuyUEnmeubYKkwGbm5UqOycRbmjeJ3zER7sOwM5b0Dy4PCutObFLlRQgb8H8ydhWOm IaaImxT/YYEUaRf/K4dHDzkW4MAqt4zFCv78lPOizR8z7yiJh0JwiCxdZTRHhPgThyPD jO9b7+b5FjM7lzh/cK0N87DBTn4ezo4wp4zZ0= Received: by 10.236.129.202 with SMTP id h50mr15143176yhi.1.1323462549155; Fri, 09 Dec 2011 12:29:09 -0800 (PST) Received: from [10.1.0.2] (cpe-76-187-13-111.tx.res.rr.com. [76.187.13.111]) by mx.google.com with ESMTPS id d6sm26836657anm.16.2011.12.09.12.29.07 (version=SSLv3 cipher=OTHER); Fri, 09 Dec 2011 12:29:08 -0800 (PST) Subject: [PATCH] xfrm: Apply fix for key lengths for rfc3686(ctr(aes)) to 2.6.32.y From: Calvin Owens To: stable@vger.kernel.org Cc: "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Calvin Owens Date: Fri, 09 Dec 2011 14:29:06 -0600 Message-ID: <1323462546.2808.8.camel@Beethoven> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This fix was applied to 3.0.3, but was not applied to the earlier series. Several widely-used distros base (or based) their kernels on this series, so the problem hasn't been fixed for them. The patch below is against 2.6.32.49. Original commit was 4203223a1aed862b4445fdcd260d6139603a51d9 Signed-off-by: Calvin Owens --- net/xfrm/xfrm_algo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index faf54c6..9bd850a 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c @@ -411,8 +411,8 @@ static struct xfrm_algo_desc ealg_list[] = { .desc = { .sadb_alg_id = SADB_X_EALG_AESCTR, .sadb_alg_ivlen = 8, - .sadb_alg_minbits = 128, - .sadb_alg_maxbits = 256 + .sadb_alg_minbits = 160, + .sadb_alg_maxbits = 288 } }, };