From patchwork Tue Apr 24 23:57:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 903905 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="E+MD8UJM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40W0dd5nT6z9s0n for ; Wed, 25 Apr 2018 09:58:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751150AbeDXX56 (ORCPT ); Tue, 24 Apr 2018 19:57:58 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:39276 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750766AbeDXX5z (ORCPT ); Tue, 24 Apr 2018 19:57:55 -0400 Received: by mail-pg0-f67.google.com with SMTP id b9so12004312pgf.6 for ; Tue, 24 Apr 2018 16:57:55 -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=P4OR2bs8LOOyKBUaIeannur0COHiKggc9aW5OIwEC7U=; b=E+MD8UJMZuGfZczQvJ5MKxA4ytUAbt7kVGStnkIsUcE3+mRnvgLBkOO0DSXqNyb969 8bGe8hIvOJFxGxzeLz/kfljMGT4EnHUj2ZVcKXSjzQJdZGFiq5mvJ+ieaJilRQgJRFkE HIbkYshDv+1zZQDzEBmxRO2b5XXZiG9S2JQRw= 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=P4OR2bs8LOOyKBUaIeannur0COHiKggc9aW5OIwEC7U=; b=WegnDQq/BmGa2hzTn7wOnYj9Q1Z4/vgpMBmp30eqP26ZwIN56c0mCmTryyprZnNtxQ 2Ldi/83McyYAO1UYTvaWVtQc0Qamh5fj1VJkrvt6fOcWUO7T2gjJqVAkhNyONQwCcRR+ yeJraXGCyXERjGS69eW8k11uBDyXE8+DzN6woi/BsG7R7zmr3yYdg7yCqB+HqmmjuKoB Bt+Ocm2xvLZM16ERvA5OUHAEQXVTv/jqNEimxDaIcI+RXS3uEiPQlALZT/rW7YiZn8LB Mx/jdctjEh29U+MgVzhxAhDgx4d1TMhAnURY6H4Y8d4F9YjP39MJcK33LW9LDwHmlhkj NY0Q== X-Gm-Message-State: ALQs6tA1oP5+sl6AJnNBUwSy9LrC7ZcOvPthA8ArSUHlHYAaQY1K0zGP w7jjJHdVW3ed5dbkVcTjPDM5RQ== X-Google-Smtp-Source: AIpwx4/UWulCtoljc6HIHXTkLtQvXx9HDu+NeynmJWx2+XdrQP1vADObO3sXpOBUcVDr3M+1/WxRbQ== X-Received: by 2002:a17:902:820a:: with SMTP id x10-v6mr26581276pln.203.1524614275512; Tue, 24 Apr 2018 16:57:55 -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 p6sm31364747pfk.104.2018.04.24.16.57.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 16:57:54 -0700 (PDT) Date: Tue, 24 Apr 2018 16:57:52 -0700 From: Kees Cook To: Kalle Valo Cc: Andreas Christoforou , Rosen Penev , Eric Dumazet , Joe Perches , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, QCA ath9k Development , kernel-hardening@lists.openwall.com, linux-kernel@vger.kernel.org Subject: [PATCH v3] ath9k: dfs: Remove VLA usage Message-ID: <20180424235752.GA37317@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 from the kernel[1], this redefines FFT_NUM_SAMPLES as a #define instead of const int, which still triggers gcc's VLA checking pass. [1] https://lkml.org/lkml/2018/3/7/621 Co-developed-by: Andreas Christoforou Signed-off-by: Kees Cook --- v3: replace FFT_NUM_SAMPLES as a #define (Joe) --- drivers/net/wireless/ath/ath9k/dfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c index 6fee9a464cce..e6e56a925121 100644 --- a/drivers/net/wireless/ath/ath9k/dfs.c +++ b/drivers/net/wireless/ath/ath9k/dfs.c @@ -40,8 +40,8 @@ static const int BIN_DELTA_MIN = 1; static const int BIN_DELTA_MAX = 10; /* we need at least 3 deltas / 4 samples for a reliable chirp detection */ -#define NUM_DIFFS 3 -static const int FFT_NUM_SAMPLES = (NUM_DIFFS + 1); +#define NUM_DIFFS 3 +#define FFT_NUM_SAMPLES (NUM_DIFFS + 1) /* Threshold for difference of delta peaks */ static const int MAX_DIFF = 2;