From patchwork Wed Apr 25 14:46:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 904275 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Iv0LWIpJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40WNLv0lGtz9rxs for ; Thu, 26 Apr 2018 00:46:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754679AbeDYOqo (ORCPT ); Wed, 25 Apr 2018 10:46:44 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:34993 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753632AbeDYOqm (ORCPT ); Wed, 25 Apr 2018 10:46:42 -0400 Received: by mail-pg0-f68.google.com with SMTP id j11so13500991pgf.2 for ; Wed, 25 Apr 2018 07:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=2tQsBi2Tvy9BONFoyp+Kg7ZktJ0b81Z5QNCojos7+ZM=; b=Iv0LWIpJ0oby74L/uohhFtfuoAqB4LIkO6/gbJ4h1yr/E9Vk7CL/oIVo3VIDFIJNxs EQGqNW/nHQh+x2yepCVZGQfS+2G95IH+XbHm3gNiBjz5nBirIftqqp0hCgF6jgk6S0g/ 6cYgG1DLAr9AdzeSS71fG12r3mKioliKCc+yc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=2tQsBi2Tvy9BONFoyp+Kg7ZktJ0b81Z5QNCojos7+ZM=; b=FepT5h1jbUuBLGmhiglEg8wqSzUqBmEdMRlcKbtzbDhRWxPOPJQIw6khHERKMnor/D y2/HH5Kdnz9dHGNGxTVEHJ9ThnfKa0pi5dCZUBCfOD6qM2yzefuYZH0lBRe5l5uN7Ea7 Kv+GxoV109Yr02Oj2JNefs6NeBjRBaeKjUGExqrTnWWvCSRy6nUswbFu4ETbz40REH1o q6G9djqZ+CpOROzcbEOhDeXJQsSTk/97gU5NTXQ6BEs9MbTZeSjNVuDgpfgQoCUD1zOd ToJm0rvZamrBGZ2ye4gjUSwjLZ+UuysGg25sMn+IbxULfFn2a7Yt6b2IGDzYzQuVIS5B eqoA== X-Gm-Message-State: ALQs6tDr5qHLli2kQ5aeQRT9F0Cj0AvdZK4BC9vNLyFjIMroaQwX+w7k bPNgCSBhO+Dt6Ebpb+cqacC7KA== X-Google-Smtp-Source: AIpwx4/tIBfZ7i/IgWIPu/WjaqHVpplQprfGRbFKZdPNdvse7AAGkN+AXZBi9kFmMmzfIGF6+hnYCw== X-Received: by 10.98.72.209 with SMTP id q78mr22822909pfi.70.1524667602141; Wed, 25 Apr 2018 07:46:42 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id a76sm37028251pfc.97.2018.04.25.07.46.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 07:46:40 -0700 (PDT) Date: Wed, 25 Apr 2018 07:46:39 -0700 From: Kees Cook To: Stefano Brivio Cc: Andreas Christoforou , kernel-hardening@lists.openwall.com, Steffen Klassert , Herbert Xu , "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 ipsec-next] xfrm: remove VLA usage in __xfrm6_sort() Message-ID: <20180425144639.GA38350@beast> MIME-Version: 1.0 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the quest to remove all stack VLA usage removed from the kernel[1], just use XFRM_MAX_DEPTH as already done for the "class" array. In one case, it'll do this loop up to 5, the other caller up to 6. [1] https://lkml.org/lkml/2018/3/7/621 Co-developed-by: Andreas Christoforou Signed-off-by: Kees Cook Acked-by: Stefano Brivio --- v4: - actually remove memset(). :) v3: - adjust Subject and commit log (Steffen) - use "= { }" instead of memset() (Stefano) v2: - use XFRM_MAX_DEPTH for "count" array (Steffen and Mathias). --- net/ipv6/xfrm6_state.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c index 16f434791763..5bdca3d5d6b7 100644 --- a/net/ipv6/xfrm6_state.c +++ b/net/ipv6/xfrm6_state.c @@ -60,11 +60,9 @@ xfrm6_init_temprop(struct xfrm_state *x, const struct xfrm_tmpl *tmpl, static int __xfrm6_sort(void **dst, void **src, int n, int (*cmp)(void *p), int maxclass) { - int i; + int count[XFRM_MAX_DEPTH] = { }; int class[XFRM_MAX_DEPTH]; - int count[maxclass]; - - memset(count, 0, sizeof(count)); + int i; for (i = 0; i < n; i++) { int c;