Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp171541imm; Tue, 18 Sep 2018 19:14:41 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdan/8Wgma0p4o7HEHv1zsaXam7QzB7KKOcfX6zKVj7MNLvO9iQ4B8Plv3+Fajc60Ksp8O8r X-Received: by 2002:a17:902:4a0c:: with SMTP id w12-v6mr32039876pld.289.1537323281924; Tue, 18 Sep 2018 19:14:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537323281; cv=none; d=google.com; s=arc-20160816; b=ekTje0qy3k2QoLTdCbrQ3TU80y0a8R0Y9mRro5n/HFxvyv1gfHF4+MlgUcMMAb0bfB iv5dTHbuBIUOkdz5+0T9O/1bZiHXhRnTYoCjwjeuTy7CWKUVYVpwzy8Bq6OcmPo2P8Bn B0YZJeF/MEFiGUy3KGobqqmdeDe+JIlOPmthLbOUd6I3+gcQbJuh2GkYT0CGGPG7g/PB XcqYZe4rWpwgCbvKGWV9V8IyZd/DlB5fE3YqLvEPqYeUgU8EBCi7NIYKFvfn7c49y1zL ESgttgFG7simv4wSi9qcHvoqara7L6jGSuRq30Esbkp6GemaPhJ5tdsb7VHM+y4lA6be BqEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=DInXt2vSOmIL9OTMoezsciUOBSCf6CUqco9YDUIBOqw=; b=wOFTyLR82C/7YpKsjuC96P2VYwvaKYkqBSCNmV2b1HUavxFHRMZhcQqWvzYzqbJo3A RAMtmD2PVub1LFm2xpw2+7UTalPNgpXHOZKJ/7ODcVcUu+DVTCWQ3O8LzL9+znFBUNlR vIg/ijFIYP9IO79NU6R/XGRZ4S3bRTKt6Tu61jaAmTnInUbwDd33WaI7W2LL5UJJQO/3 e7IGv9Y4lgeDu2Z2q44LeSPdCUya026EQOTSkqzQ/fQ0lMXM68chB7f31kEQX5Gg7BI2 2rQYyHU8S6KH2twIFi4fb0yg69jDXC8eadsqb5yAOc4Ot72eG73Nx49RkjgNAhAMEO+q UU9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=BSRyD3jF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d9-v6si21576909pfk.166.2018.09.18.19.14.27; Tue, 18 Sep 2018 19:14:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=BSRyD3jF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731110AbeISHsE (ORCPT + 99 others); Wed, 19 Sep 2018 03:48:04 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:43669 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730890AbeISHqk (ORCPT ); Wed, 19 Sep 2018 03:46:40 -0400 Received: by mail-pg1-f194.google.com with SMTP id q19-v6so1077940pgn.10 for ; Tue, 18 Sep 2018 19:11:13 -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=DInXt2vSOmIL9OTMoezsciUOBSCf6CUqco9YDUIBOqw=; b=BSRyD3jFcNmp6pnmIBWpkRXPEmmaVHKzQsckwdvd0dDT0FEcde+t5PYdBfXmpCpuy9 KJ2Lwzg+TaR4YEpI6HXcWuYIOEbnztZOddMTbdO355111jFH0X7ZPgBpxOIb2qpHAD1a Lp/D0LZA7ECfgM5ETR6eAA2Q+NsF2OWGD/Brk= 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=DInXt2vSOmIL9OTMoezsciUOBSCf6CUqco9YDUIBOqw=; b=sBcb8DHlwI6Pdo22zwaVpauDgyIik3HY0+UvmGl4huZLanI7VB8AD5EVZDjo4hYhyv 3SBETaMrmwE6uzHbI38Kooz50phNo/nDD6ROCAtUW6o1lx38SH0Ori58yZc9pUL/vM7G SuO8d/+Ct8uPVRE3m9nEPxUNHkdsoFw5StB1GmyAEYfaoZLFyqxu38lS/2EnzA0QpRLp DfRlGKoWM8k1CKXXzmXmKxnzzZU4s2Y3acq3/zM+1lkclucvONI1Bnw6977PmYjJly5w 1q/wMg6oFlCAIKU+rp9hUPyQp9i46lEgPvTkBM0heUWKB4oWNojsnIpcQltyEBu3pY08 UNbQ== X-Gm-Message-State: APzg51AtrsXnDYsUsX925u9cvoq1Oc+BF9oRh9EX805n8RVe7YzXGwAk 26pqquOVPzWwQfpfJoYaEhv8Tw== X-Received: by 2002:a62:571b:: with SMTP id l27-v6mr33431544pfb.29.1537323072563; Tue, 18 Sep 2018 19:11:12 -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 c1-v6sm32084957pfg.25.2018.09.18.19.11.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Sep 2018 19:11:10 -0700 (PDT) From: Kees Cook To: Herbert Xu Cc: Kees Cook , Jens Axboe , linux-block@vger.kernel.org, Ard Biesheuvel , Eric Biggers , linux-crypto , Linux Kernel Mailing List Subject: [PATCH crypto-next 07/23] block: cryptoloop: Remove VLA usage of skcipher Date: Tue, 18 Sep 2018 19:10:44 -0700 Message-Id: <20180919021100.3380-8-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180919021100.3380-1-keescook@chromium.org> References: <20180919021100.3380-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the quest to remove all stack VLA usage from the kernel[1], this replaces struct crypto_skcipher and SKCIPHER_REQUEST_ON_STACK() usage with struct crypto_sync_skcipher and SYNC_SKCIPHER_REQUEST_ON_STACK(), which uses a fixed stack size. [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Cc: Jens Axboe Cc: linux-block@vger.kernel.org Signed-off-by: Kees Cook --- drivers/block/cryptoloop.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c index 7033a4beda66..254ee7d54e91 100644 --- a/drivers/block/cryptoloop.c +++ b/drivers/block/cryptoloop.c @@ -45,7 +45,7 @@ cryptoloop_init(struct loop_device *lo, const struct loop_info64 *info) char cms[LO_NAME_SIZE]; /* cipher-mode string */ char *mode; char *cmsp = cms; /* c-m string pointer */ - struct crypto_skcipher *tfm; + struct crypto_sync_skcipher *tfm; /* encryption breaks for non sector aligned offsets */ @@ -80,13 +80,13 @@ cryptoloop_init(struct loop_device *lo, const struct loop_info64 *info) *cmsp++ = ')'; *cmsp = 0; - tfm = crypto_alloc_skcipher(cms, 0, CRYPTO_ALG_ASYNC); + tfm = crypto_alloc_sync_skcipher(cms, 0, 0); if (IS_ERR(tfm)) return PTR_ERR(tfm); - err = crypto_skcipher_setkey(tfm, info->lo_encrypt_key, - info->lo_encrypt_key_size); - + err = crypto_sync_skcipher_setkey(tfm, info->lo_encrypt_key, + info->lo_encrypt_key_size); + if (err != 0) goto out_free_tfm; @@ -94,7 +94,7 @@ cryptoloop_init(struct loop_device *lo, const struct loop_info64 *info) return 0; out_free_tfm: - crypto_free_skcipher(tfm); + crypto_free_sync_skcipher(tfm); out: return err; @@ -109,8 +109,8 @@ cryptoloop_transfer(struct loop_device *lo, int cmd, struct page *loop_page, unsigned loop_off, int size, sector_t IV) { - struct crypto_skcipher *tfm = lo->key_data; - SKCIPHER_REQUEST_ON_STACK(req, tfm); + struct crypto_sync_skcipher *tfm = lo->key_data; + SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm); struct scatterlist sg_out; struct scatterlist sg_in; @@ -119,7 +119,7 @@ cryptoloop_transfer(struct loop_device *lo, int cmd, unsigned in_offs, out_offs; int err; - skcipher_request_set_tfm(req, tfm); + skcipher_request_set_sync_tfm(req, tfm); skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_SLEEP, NULL, NULL); @@ -175,9 +175,9 @@ cryptoloop_ioctl(struct loop_device *lo, int cmd, unsigned long arg) static int cryptoloop_release(struct loop_device *lo) { - struct crypto_skcipher *tfm = lo->key_data; + struct crypto_sync_skcipher *tfm = lo->key_data; if (tfm != NULL) { - crypto_free_skcipher(tfm); + crypto_free_sync_skcipher(tfm); lo->key_data = NULL; return 0; } -- 2.17.1