From patchwork Mon Jul 22 12:26:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 169374 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp7463811ilk; Mon, 22 Jul 2019 05:27:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqwmhMFLIWXUNVXzuDSjGBRatJPU3i6t1Ca+3V8/6Oy6GyWWoCUuco3/Nq89PpVpCWcHKEYL X-Received: by 2002:a17:90a:c20e:: with SMTP id e14mr35163433pjt.0.1563798424369; Mon, 22 Jul 2019 05:27:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563798424; cv=none; d=google.com; s=arc-20160816; b=hs9yrICMmLv3QnS25sZveiIUXj7D9WS0s70rf7pBPkNJjiuPcvztT7TKNIc3yqHJKF AfmipgzwMqDgIUewT+HtTiXBOvLpoadl1ms/2QDxhiGtTzrSFSmUuAgJ/HrSDMZ5TscT y0QlAHsh6ILakAES/5KRh14uG2uqeIoT4UT4jcsK+4qYL3ZkkJrEsr73ZcnY4dSRLtKW 9sXNLkGhTx66l4C9XqMASoWG6OGgwI5/NmOo7R5HlbIb6l3So7pxEkpAY2y/z6aufrzd bvPhCJiCdQsR+h7YtK6/5APdSUmy1/9dKU0QzmOwkq2u/Qb4k3p4N1rbJSmgc0NoAxPn j3ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Fv8hugCBoIx/Q3Fy16D1zd2fZY1SOamgZUucCQcurVo=; b=zhFBq42spQvcbfdUYPatRg/6gneqKAoNxar3uVYI40pUB+pHouX/p+ugq1at6wdb8T 9bTsmQzcawuz6Ajz+u7yIAFnIzkjjnxZucgrdOmGE+re0npQsOdPRI7JkmfXixiIzdwt sKC+xfVHh7aGIBDg+FxdRenjYJVE/PuiMcQzwPW/p7ITLjzZBNvh4VQRSJ+EpiV8dQIr G8ut/nYi5gXn1PmGeMi5uI5uq7mC090I65N3HRiQP2L2TH90CWAV4QtOTPgfdSZ0S2Zu /0oHccaiPO7zm0h9PyGFrPHVnBfyQDMTL3lfhpSP2d8W6StnYJuG4EXQUF7EQsAx2ik6 lPtA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 39si8316366pla.73.2019.07.22.05.27.04; Mon, 22 Jul 2019 05:27:04 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729270AbfGVM1C (ORCPT + 29 others); Mon, 22 Jul 2019 08:27:02 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:44531 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727040AbfGVM1C (ORCPT ); Mon, 22 Jul 2019 08:27:02 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MS3rB-1i0ppS27tD-00TS5J; Mon, 22 Jul 2019 14:26:49 +0200 From: Arnd Bergmann To: Philipp Reisner , Lars Ellenberg , Jens Axboe Cc: Arnd Bergmann , Roland Kammerer , Herbert Xu , Eric Biggers , Kees Cook , drbd-dev@lists.linbit.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com Subject: [PATCH] [v2] drbd: dynamically allocate shash descriptor Date: Mon, 22 Jul 2019 14:26:34 +0200 Message-Id: <20190722122647.351002-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:TUkJdt6WnOtvIKaR0C75bjyJONsAuTghX9dFPBuK/8hnMLggk3n oaimOoXAU2Z5zyElT/gELYVsGJyidfA2ExueKc9APQYmKTBUXBWzq5pdcaRaVmUMkwDM8eK 3TBy71px+BMkF5WdicIU/qxkzYwfULo/cL305TewpfFFQBaqDWboMCadDAH4olBURs/jRw1 q6sUBbFtTzs7Kvn0ZEUiw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:c+P8+Y3Ft70=:cJiCb3/FiWtXQt/BwQwW7R NFYvnQ8N1hPvLKZIghEf+kKVLp7/kYyBTvTNO8WRdxBLi6aZP1xjhkRrR0kMmjCvamRDEfSMs gZJXxkU2vatLVaS2KQmDYMP4kGEuVjnlasytI3typK7ZlwrqSJ0NaCUqsTy7S333zZSGHs4we a3lsh2QvQ9+Jlfcdwp4v7OMZ6FEsjpqMaXDc/oaUbLiuh+19kl0pHsbyKASPN2c6+TCY25h37 n6tWNAVq5qPl7ZWYUqCUpNg8bHxEic5Epqj2drDgWR2AR5syCs5UmqyyBf4puZkcwlf7ucH20 Hdx+GYhU6FKYnr+i1WUNPUpKQCYSM6q2Zrx9MaYRxHg3ouuZYDuccKneHpBCS54imGAe21V2v ha+4JHczutkINYtlqy6nw/izraZz4BditGhG+wUcQ3N3LUDdt+FsixBVenTycVe4C4SlHiDPx 7rO2CuGkxEe7xx9W8jU3EI9DjxPA9dte96y8Jp7VRRDTYgFnJ624Zn9GY7jnHggrs5plQwL4J c3piWuVfYT7abyUKKFYAd1J3URNK6RaAm9pWQKo/mvw8Shagyp2waz26zy8ZDYdpFE5J+jByH IsqSu8GRhkI2vZELyGUk7Ar/XDURoYk+OoZN4Myfw4LxBNIokSVNk/0g07x/2/5FsOC20P/5g Zc0ys9eBkBw/gcZfRv0XEfBZ+uZo+Lo6QuVzJOttdiEFxMlllL4gKq4yB9Bj1wnlh+aOP6rtC sfi5B0rcPguhvN9lACFtnrg2/8lpmleYob2zkw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building with clang and KASAN, we get a warning about an overly large stack frame on 32-bit architectures: drivers/block/drbd/drbd_receiver.c:921:31: error: stack frame size of 1280 bytes in function 'conn_connect' [-Werror,-Wframe-larger-than=] We already allocate other data dynamically in this function, so just do the same for the shash descriptor, which makes up most of this memory. Link: https://lore.kernel.org/lkml/20190617132440.2721536-1-arnd@arndb.de/ Signed-off-by: Arnd Bergmann --- v2: - don't try to zero a NULL descriptor pointer, based on review from Roland Kammerer. --- drivers/block/drbd/drbd_receiver.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -- 2.20.0 Reviewed-by: Kees Cook Reviewed-by: Roland Kammerer diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 90ebfcae0ce6..2b3103c30857 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -5417,7 +5417,7 @@ static int drbd_do_auth(struct drbd_connection *connection) unsigned int key_len; char secret[SHARED_SECRET_MAX]; /* 64 byte */ unsigned int resp_size; - SHASH_DESC_ON_STACK(desc, connection->cram_hmac_tfm); + struct shash_desc *desc; struct packet_info pi; struct net_conf *nc; int err, rv; @@ -5430,6 +5430,13 @@ static int drbd_do_auth(struct drbd_connection *connection) memcpy(secret, nc->shared_secret, key_len); rcu_read_unlock(); + desc = kmalloc(sizeof(struct shash_desc) + + crypto_shash_descsize(connection->cram_hmac_tfm), + GFP_KERNEL); + if (!desc) { + rv = -1; + goto fail; + } desc->tfm = connection->cram_hmac_tfm; rv = crypto_shash_setkey(connection->cram_hmac_tfm, (u8 *)secret, key_len); @@ -5571,7 +5578,10 @@ static int drbd_do_auth(struct drbd_connection *connection) kfree(peers_ch); kfree(response); kfree(right_response); - shash_desc_zero(desc); + if (desc) { + shash_desc_zero(desc); + kfree(desc); + } return rv; }