From patchwork Tue Jul 24 16:49:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10542645 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A2ADA90E3 for ; Tue, 24 Jul 2018 16:52:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90EEF291F7 for ; Tue, 24 Jul 2018 16:52:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D81729185; Tue, 24 Jul 2018 16:52:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BD1D291E5 for ; Tue, 24 Jul 2018 16:52:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388527AbeGXR5I (ORCPT ); Tue, 24 Jul 2018 13:57:08 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:44856 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388495AbeGXR5I (ORCPT ); Tue, 24 Jul 2018 13:57:08 -0400 Received: by mail-pf1-f194.google.com with SMTP id k21-v6so981292pff.11 for ; Tue, 24 Jul 2018 09:49:47 -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; bh=XDw0a+jCaRK07DPwSkSUufRYjzCRo7QSPtOCTbdYGig=; b=DJygc/ZuxYg2AQ0JUqgfs8uSOmuzC2wxtA9su7QqdjIBMjpPTjtoqTkFsjjOkK13tX DZND+IYwF3ufwEU6d4yCv9al5NkBEhjAgW0Bw1NgqL+cWS6cK4iz3fEyyRcI1i8khmPc 4DJ1U/NXRloXV+JQTjlVXGvHO9J7bQhoArsTE= 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; bh=XDw0a+jCaRK07DPwSkSUufRYjzCRo7QSPtOCTbdYGig=; b=XEy5OtfbhL61/z4cj0mD+IyQmt9Qx/MahWuCFY6MENSf24J7cKiv5JAq3T+awrI+br w87tbudiByUzfSjz2ekTcWWuAuHhLxDL+Xx0yq25qoqLm56hoQcoyu3rqSY/dUDuFsZu v/DK0nVEi9o4wBxH45/T1JqmOpK8XonsnTHE/L+MFMVwQICpoHZA/GKWmhAWnm5hlWC+ 32IJFGs38HwQmDANDG0siWrAKBTeCphTKtmUr7q+3Eu1sSl7XRDrLbzk1BlekmaY9KXf 1gnBvkJnelt9ToIMkZC1lnBmMwtLmrn/NFYa8ZmgvvzUIC5ttoBtznms/X88Cku4owfv M3cA== X-Gm-Message-State: AOUpUlHcQeg5nV+K7hJojyLSS6sCE9c990OmcGhXkslWzWJXgOvbF2zt 24VrRq2yHLcg33rVml4DBOuRRg== X-Google-Smtp-Source: AAOMgpejwAxrjuI1z2QcP7sAwD36/xBj0gpdarxw/C4svHwjAhOwWLvU80FDlLknSYQwJO4HAZbEtw== X-Received: by 2002:a63:7703:: with SMTP id s3-v6mr17343122pgc.339.1532450987414; Tue, 24 Jul 2018 09:49:47 -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 d123-v6sm17965601pfa.22.2018.07.24.09.49.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 09:49:42 -0700 (PDT) From: Kees Cook To: Herbert Xu Cc: Kees Cook , Arnd Bergmann , Eric Biggers , "Gustavo A. R. Silva" , Alasdair Kergon , Rabin Vincent , Tim Chen , "Rafael J. Wysocki" , Pavel Machek , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Philipp Reisner , Lars Ellenberg , Jens Axboe , Giovanni Cabiddu , Mike Snitzer , Paul Mackerras , Greg Kroah-Hartman , David Howells , Johannes Berg , Tudor-Dan Ambarus , Jia-Ju Bai , Andrew Morton , Geert Uytterhoeven , Josh Poimboeuf , David Woodhouse , Will Deacon , dm-devel@redhat.com, linux-pm@vger.kernel.org, linux-crypto@vger.kernel.org, drbd-dev@lists.linbit.com, linux-block@vger.kernel.org, qat-linux@intel.com, linux-ppp@vger.kernel.org, netdev@vger.kernel.org, devel@driverdev.osuosl.org, linux-afs@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 00/18] crypto: Remove VLA usage Date: Tue, 24 Jul 2018 09:49:18 -0700 Message-Id: <20180724164936.37477-1-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For newly added CCs on this series: your Ack/Review would be very welcome! Especially for the ahash-to-shash conversion patches. v6: - make xcbc blocksize unconditional - add ahash-to-shash conversion patch series to entirely remove AHASH_REQUEST_ON_STACK from the kernel v5: - limit AHASH_REQUEST_ON_STACK size only to non-async hash wrapping. - sanity-check ahash reqsize only when doing shash wrapping. - remove frame_warn changes in favor of shash conversions and other fixes. - send ahash to shash conversion patches and other fixes separately. v4: - add back *_REQUEST_ON_STACK patches. - programmatically find stack sizes for *_REQUEST_ON_STACK patches. - whitelist some code that trips FRAME_WARN on 32-bit builds. - fix alignment patches. v3: - drop *_REQUEST_ON_STACK patches. The rest of this series is pretty straight-forward, and I'd like to get them tested in -next while we continue to chip away at the *_REQUEST_ON_STACK VLA removal patches separately. "Part 2" will continue with those. v2: - use 512 instead of PAGE_SIZE / 8 to avoid bloat on large-page archs. - swtich xcbc to "16" max universally. - fix typo in bounds check for dm buffer size. - examine actual reqsizes for skcipher and ahash instead of guessing. - improve names and comments for alg maxes This is nearly the last of the VLA removals[1], but it's one of the largest because crypto gets used in lots of places. After looking through code, usage, reading the threads Gustavo started, and comparing the use-cases to the other VLA removals that have landed in the kernel, I think this series is likely the best way forward to shut the door on VLAs forever. For background, the crypto stack usage is for callers to do an immediate bit of work that doesn't allocate new memory. This means that other VLA removal techniques (like just using kmalloc) aren't workable, and the next common technique is needed: examination of maximum stack usage and the addition of sanity checks. This series does that, and in several cases, these maximums were already implicit in the code. This series is intended to land via the crypto tree for 4.19, though it touches dm, networking, and a few other things as well, since there are dependent patches (new crypto #defines being used, etc). Thanks! -Kees [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Ard Biesheuvel (1): crypto: ccm: Remove VLA usage Kees Cook (17): crypto: xcbc: Remove VLA usage crypto: cbc: Remove VLA usage crypto: hash: Remove VLA usage dm: Remove VLA usage from hashes crypto alg: Introduce generic max blocksize and alignmask crypto: qat: Remove VLA usage crypto: shash: Remove VLA usage in unaligned hashing crypto: skcipher: Remove VLA usage for SKCIPHER_REQUEST_ON_STACK ppp: mppe: Remove VLA usage x86/power/64: Remove VLA usage dm crypt: Convert essiv from ahash to shash drbd: Convert from ahash to shash wireless/lib80211: Convert from ahash to shash staging: rtl8192u: ieee80211: Convert from ahash to shash staging: rtl8192e: ieee80211: Convert from ahash to shash rxrpc: Reuse SKCIPHER_REQUEST_ON_STACK buffer crypto: Remove AHASH_REQUEST_ON_STACK arch/x86/power/hibernate_64.c | 36 +++++++----- crypto/ahash.c | 4 +- crypto/algapi.c | 7 ++- crypto/algif_hash.c | 2 +- crypto/ccm.c | 9 ++- crypto/shash.c | 33 ++++++----- crypto/xcbc.c | 8 ++- drivers/block/drbd/drbd_int.h | 13 +++-- drivers/block/drbd/drbd_main.c | 14 ++--- drivers/block/drbd/drbd_nl.c | 39 ++++--------- drivers/block/drbd/drbd_receiver.c | 35 +++++------ drivers/block/drbd/drbd_worker.c | 56 ++++++++---------- drivers/crypto/qat/qat_common/qat_algs.c | 8 ++- drivers/md/dm-crypt.c | 31 +++++----- drivers/md/dm-integrity.c | 23 ++++++-- drivers/md/dm-verity-fec.c | 5 +- drivers/net/ppp/ppp_mppe.c | 56 +++++++++--------- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 56 +++++++++--------- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 57 +++++++++--------- include/crypto/algapi.h | 4 +- include/crypto/cbc.h | 4 +- include/crypto/hash.h | 11 ++-- include/crypto/internal/skcipher.h | 1 + include/crypto/skcipher.h | 4 +- include/linux/compiler-gcc.h | 1 - net/rxrpc/rxkad.c | 25 ++++---- net/wireless/lib80211_crypt_tkip.c | 58 +++++++++---------- 27 files changed, 313 insertions(+), 287 deletions(-)