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=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 90208C43469 for ; Mon, 21 Sep 2020 16:47:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 531C52389F for ; Mon, 21 Sep 2020 16:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706827; bh=1Bp/N8b6BrR0j8s83qx3/wG4R3CA7d56WlGFrJgI4oc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zPkNr/5HoYGQ1VBKsX3TUA6Q2rfNa0wxJ7sww0Its5ottmHuWWJRQSG59LVyE0v7s AMGuyXQ6xkF5eF2fd/taUXh1G0H/Ikbn5yVx2R2hTE+wpB6Jb/Ua+8unCW45hljOon knTpd7xF6oej/cUsm//MMjgCXY6odr6hcRkI0kVs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728153AbgIUQrG (ORCPT ); Mon, 21 Sep 2020 12:47:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:53746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729590AbgIUQrE (ORCPT ); Mon, 21 Sep 2020 12:47:04 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 727F6238D6; Mon, 21 Sep 2020 16:47:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706824; bh=1Bp/N8b6BrR0j8s83qx3/wG4R3CA7d56WlGFrJgI4oc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Ez3f6iNgRPaDdX9kKS9T6ecjUpVBuXhekZAOWIxcwk+uaIiJlNJK/B/IFlihfY25 uGaoVxBHJcLeZs8IEvSmpVqBRh6vwEZTu3DjYFmBvJR5t6R3x0KxmouMePImUCtZWk AtFXTn1rCQsGFsY3AnZTTB8fjDUxhoGtnC92mrHQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harald Freudenberger , Ingo Franzki , Vasily Gorbik Subject: [PATCH 5.8 108/118] s390/zcrypt: fix kmalloc 256k failure Date: Mon, 21 Sep 2020 18:28:40 +0200 Message-Id: <20200921162041.396732093@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921162036.324813383@linuxfoundation.org> References: <20200921162036.324813383@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Harald Freudenberger commit b6186d7fb53349efd274263a45f0b08749ccaa2d upstream. Tests showed that under stress conditions the kernel may temporary fail to allocate 256k with kmalloc. However, this fix reworks the related code in the cca_findcard2() function to use kvmalloc instead. Signed-off-by: Harald Freudenberger Reviewed-by: Ingo Franzki Cc: Stable Signed-off-by: Vasily Gorbik Signed-off-by: Greg Kroah-Hartman --- drivers/s390/crypto/zcrypt_ccamisc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/s390/crypto/zcrypt_ccamisc.c +++ b/drivers/s390/crypto/zcrypt_ccamisc.c @@ -1685,9 +1685,9 @@ int cca_findcard2(u32 **apqns, u32 *nr_a *nr_apqns = 0; /* fetch status of all crypto cards */ - device_status = kmalloc_array(MAX_ZDEV_ENTRIES_EXT, - sizeof(struct zcrypt_device_status_ext), - GFP_KERNEL); + device_status = kvmalloc_array(MAX_ZDEV_ENTRIES_EXT, + sizeof(struct zcrypt_device_status_ext), + GFP_KERNEL); if (!device_status) return -ENOMEM; zcrypt_device_status_mask_ext(device_status); @@ -1755,7 +1755,7 @@ int cca_findcard2(u32 **apqns, u32 *nr_a verify = 0; } - kfree(device_status); + kvfree(device_status); return rc; } EXPORT_SYMBOL(cca_findcard2);