From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF56AC1B0E3 for ; Wed, 11 Jul 2018 20:36:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5382720C0C for ; Wed, 11 Jul 2018 20:36:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="FfOz6yu8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5382720C0C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390343AbeGKUmk (ORCPT ); Wed, 11 Jul 2018 16:42:40 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:41139 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390322AbeGKUmk (ORCPT ); Wed, 11 Jul 2018 16:42:40 -0400 Received: by mail-pg1-f195.google.com with SMTP id z8-v6so1748358pgu.8 for ; Wed, 11 Jul 2018 13:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ck0rBXfaj7OBJNHlsB+wNQqwrCsF6ZBfskWdE1MC6Kk=; b=FfOz6yu8vl+0utBEOMCZeLDG2uzphgY9FsbSiDCFT3FDLnUqjLGdknW9DLFEakx/hH Vt9hS/nkoEZtzZBmxR2GLivwO5JP/j7FoNKMdjn8yaWKa0Jyhpeq5rvvuPrBjikwHozB bCeiH6Rq338FTmvVT2BFazeKPP0naw29ctnDQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ck0rBXfaj7OBJNHlsB+wNQqwrCsF6ZBfskWdE1MC6Kk=; b=gRke3G6XhaOZTPYASf9VlKHpO0a5Dp9r0qs3a0oVlCwtFVExfY86fvUAhzsifIZ/tp ns9JSzJy1HHKtYN4qQfhtWXuXJh8V4c8L3+UZUNtozpeQsuQUDJn7pTd08EIRFJWk/jv EdCtpiy9UVvage0fzYkUJkTjAUNpQ2CKiAGqRcoa/k2pT2/0/G/VCdBc97Bqs5pzJP9T ZrfEAl5Ixv/LNZvXBFxjRREnEwo7kZX3zKPQWbLKWL5eLkuzyHDpUIPseCADfg9anVAu DXBYQNjXevygPktPjtC5IdyFRcupL4MFRnBv+vYyg46XLc+rWmScMbjp0Gq5/4iX0Fsn LN0w== X-Gm-Message-State: AOUpUlFmuNciqXoMlGES9weoCCMhaWAy6OOilOTo/Uzgd4YhDoG7Qw5e 0iQkh+1frto28CyLnwsCgr6qgg== X-Google-Smtp-Source: AAOMgpfaZRRCp4ZaGa4RlQsIqvNrbnWFiZMnxT5Pb5fwnjuZeg7Sxcacwt0QqX19Cly5jrg3LTphIA== X-Received: by 2002:a62:d1b:: with SMTP id v27-v6mr143740pfi.87.1531341396463; Wed, 11 Jul 2018 13:36:36 -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 u68-v6sm32582011pfb.159.2018.07.11.13.36.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Jul 2018 13:36:35 -0700 (PDT) From: Kees Cook To: Herbert Xu Cc: Kees Cook , "Gustavo A. R. Silva" , Arnd Bergmann , Eric Biggers , Alasdair Kergon , Giovanni Cabiddu , Lars Persson , Mike Snitzer , Rabin Vincent , Tim Chen , "David S. Miller" , Masahiro Yamada , linux-crypto@vger.kernel.org, qat-linux@intel.com, dm-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 11/14] treewide: Prepare to remove VLA usage for AHASH_REQUEST_ON_STACK Date: Wed, 11 Jul 2018 13:36:16 -0700 Message-Id: <20180711203619.1020-12-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180711203619.1020-1-keescook@chromium.org> References: <20180711203619.1020-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Several uses of AHASH_REQUEST_ON_STACK() will trigger FRAME_WARN warnings (when less than 2048) once the VLA is no longer hidden from the check: drivers/block/drbd/drbd_worker.c:325:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=] drivers/block/drbd/drbd_worker.c:352:1: warning: the frame size of 1120 bytes is larger than 1024 bytes [-Wframe-larger-than=] crypto/ccm.c:235:1: warning: the frame size of 1184 bytes is larger than 1024 bytes [-Wframe-larger-than=] drivers/md/dm-crypt.c:353:1: warning: the frame size of 1096 bytes is larger than 1024 bytes [-Wframe-larger-than=] drivers/net/ppp/ppp_mppe.c:158:1: warning: the frame size of 1168 bytes is larger than 1024 bytes [-Wframe-larger-than=] net/wireless/lib80211_crypt_tkip.c:537:1: warning: the frame size of 1136 bytes is larger than 1024 bytes [-Wframe-larger-than=] drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c:528:1: warning: the frame size of 1136 bytes is larger than 1024 bytes [-Wframe-larger-than=] drivers/staging/rtl8192e/rtllib_crypt_tkip.c:531:1: warning: the frame size of 1136 bytes is larger than 1024 bytes [-Wframe-larger-than=] This bumps the affected objects by 20% to silence the warnings while still providing coverage is anything grows even more. Signed-off-by: Kees Cook --- crypto/Makefile | 1 + drivers/block/drbd/Makefile | 2 ++ drivers/md/Makefile | 1 + drivers/net/ppp/Makefile | 1 + drivers/staging/rtl8192e/Makefile | 1 + drivers/staging/rtl8192u/Makefile | 1 + drivers/staging/rtl8192u/ieee80211/Makefile | 1 + net/wireless/Makefile | 1 + 8 files changed, 9 insertions(+) diff --git a/crypto/Makefile b/crypto/Makefile index 6d1d40eeb964..a4487b61ac4e 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -85,6 +85,7 @@ obj-$(CONFIG_CRYPTO_CTR) += ctr.o obj-$(CONFIG_CRYPTO_KEYWRAP) += keywrap.o obj-$(CONFIG_CRYPTO_GCM) += gcm.o obj-$(CONFIG_CRYPTO_CCM) += ccm.o +CFLAGS_ccm.o += $(FRAME_WARN_BUMP_FLAG) obj-$(CONFIG_CRYPTO_CHACHA20POLY1305) += chacha20poly1305.o obj-$(CONFIG_CRYPTO_AEGIS128) += aegis128.o obj-$(CONFIG_CRYPTO_AEGIS128L) += aegis128l.o diff --git a/drivers/block/drbd/Makefile b/drivers/block/drbd/Makefile index 8bd534697d1b..9b6184487cb4 100644 --- a/drivers/block/drbd/Makefile +++ b/drivers/block/drbd/Makefile @@ -7,3 +7,5 @@ drbd-y += drbd_nla.o drbd-$(CONFIG_DEBUG_FS) += drbd_debugfs.o obj-$(CONFIG_BLK_DEV_DRBD) += drbd.o + +CFLAGS_drbd_worker.o += $(FRAME_WARN_BUMP_FLAG) diff --git a/drivers/md/Makefile b/drivers/md/Makefile index 822f4e8753bc..639ff6599846 100644 --- a/drivers/md/Makefile +++ b/drivers/md/Makefile @@ -47,6 +47,7 @@ obj-$(CONFIG_DM_UNSTRIPED) += dm-unstripe.o obj-$(CONFIG_DM_BUFIO) += dm-bufio.o obj-$(CONFIG_DM_BIO_PRISON) += dm-bio-prison.o obj-$(CONFIG_DM_CRYPT) += dm-crypt.o +CFLAGS_dm-crypt.o += $(FRAME_WARN_BUMP_FLAG) obj-$(CONFIG_DM_DELAY) += dm-delay.o obj-$(CONFIG_DM_FLAKEY) += dm-flakey.o obj-$(CONFIG_DM_MULTIPATH) += dm-multipath.o dm-round-robin.o diff --git a/drivers/net/ppp/Makefile b/drivers/net/ppp/Makefile index 16c457d6b324..18f35e449c93 100644 --- a/drivers/net/ppp/Makefile +++ b/drivers/net/ppp/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_PPP_ASYNC) += ppp_async.o obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o +CFLAGS_ppp_mppe.o += $(FRAME_WARN_BUMP_FLAG) obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o obj-$(CONFIG_PPPOE) += pppox.o pppoe.o obj-$(CONFIG_PPPOL2TP) += pppox.o diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile index 6af519938868..fde738cdf876 100644 --- a/drivers/staging/rtl8192e/Makefile +++ b/drivers/staging/rtl8192e/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_RTLLIB) += rtllib.o obj-$(CONFIG_RTLLIB_CRYPTO_CCMP) += rtllib_crypt_ccmp.o obj-$(CONFIG_RTLLIB_CRYPTO_TKIP) += rtllib_crypt_tkip.o +CFLAGS_rtllib_crypt_tkip.o += $(FRAME_WARN_BUMP_FLAG) obj-$(CONFIG_RTLLIB_CRYPTO_WEP) += rtllib_crypt_wep.o obj-$(CONFIG_RTL8192E) += rtl8192e/ diff --git a/drivers/staging/rtl8192u/Makefile b/drivers/staging/rtl8192u/Makefile index 3022728a364c..ad059546df88 100644 --- a/drivers/staging/rtl8192u/Makefile +++ b/drivers/staging/rtl8192u/Makefile @@ -26,5 +26,6 @@ r8192u_usb-y := r8192U_core.o r8180_93cx6.o r8192U_wx.o \ ieee80211/rtl819x_TSProc.o \ ieee80211/rtl819x_BAProc.o \ ieee80211/dot11d.o +CFLAGS_ieee80211_crypt_tkip.o += $(FRAME_WARN_BUMP_FLAG) obj-$(CONFIG_RTL8192U) += r8192u_usb.o diff --git a/drivers/staging/rtl8192u/ieee80211/Makefile b/drivers/staging/rtl8192u/ieee80211/Makefile index 0d4d6489f767..9f3a06674c1a 100644 --- a/drivers/staging/rtl8192u/ieee80211/Makefile +++ b/drivers/staging/rtl8192u/ieee80211/Makefile @@ -17,6 +17,7 @@ ieee80211-rsl-objs := ieee80211_rx.o \ ieee80211_crypt-rsl-objs := ieee80211_crypt.o ieee80211_crypt_tkip-rsl-objs := ieee80211_crypt_tkip.o +CFLAGS_ieee80211_crypt_tkip.o += $(FRAME_WARN_BUMP_FLAG) ieee80211_crypt_ccmp-rsl-objs := ieee80211_crypt_ccmp.o ieee80211_crypt_wep-rsl-objs := ieee80211_crypt_wep.o diff --git a/net/wireless/Makefile b/net/wireless/Makefile index 1d84f91bbfb0..f6af5a6233e1 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_LIB80211) += lib80211.o obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o +CFLAGS_lib80211_crypt_tkip.o += $(FRAME_WARN_BUMP_FLAG) obj-$(CONFIG_WEXT_CORE) += wext-core.o obj-$(CONFIG_WEXT_PROC) += wext-proc.o -- 2.17.1