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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 3F1C3CA9EAF for ; Sun, 27 Oct 2019 21:24:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03E0B21783 for ; Sun, 27 Oct 2019 21:24:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211459; bh=t69A56lr0lOMmewix5iSiPHCFZCowdC0rRu0+B5hnBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Hdvyh7aqKgbBCBOoz+ZVlfLEa13HmfNof229b0GcCrYg8IVko4JdFW8tG3tDe0mdD NlbjtlUdmSZJpqrfzQd4u80OXj32xh+P5lKb/PW/uZLfeAgl3goPvcuBxmDXiGVR+O vB9ibwdnQW4/xbcnqAqaftVNWFk9ZYK8A1l2d/ts= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732480AbfJ0VYS (ORCPT ); Sun, 27 Oct 2019 17:24:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:45852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730777AbfJ0VYR (ORCPT ); Sun, 27 Oct 2019 17:24:17 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 1931521726; Sun, 27 Oct 2019 21:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211456; bh=t69A56lr0lOMmewix5iSiPHCFZCowdC0rRu0+B5hnBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AJux7bHx8bwNBX+spHP+RVrVwwr2QdOFbhszpB1oe6EW2zZ5f30IGwRuNF7xfFa+8 63OlEWNSwIMqoHwCczXfVs/hwdJG7xXLNWzynJ2gOwevIVOclH1pt0aos3C4MBoIkr 6pju2HGzM+R/p7dqDDmW8vJ+lelaReqRn9A1hLvQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harald Freudenberger , Johan Hovold , Heiko Carstens , Vasily Gorbik Subject: [PATCH 5.3 158/197] s390/zcrypt: fix memleak at release Date: Sun, 27 Oct 2019 22:01:16 +0100 Message-Id: <20191027203400.212151946@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johan Hovold commit 388bb19be8eab4674a660e0c97eaf60775362bc7 upstream. If a process is interrupted while accessing the crypto device and the global ap_perms_mutex is contented, release() could return early and fail to free related resources. Fixes: 00fab2350e6b ("s390/zcrypt: multiple zcrypt device nodes support") Cc: # 4.19 Cc: Harald Freudenberger Signed-off-by: Johan Hovold Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik Signed-off-by: Greg Kroah-Hartman --- drivers/s390/crypto/zcrypt_api.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/s390/crypto/zcrypt_api.c +++ b/drivers/s390/crypto/zcrypt_api.c @@ -539,8 +539,7 @@ static int zcrypt_release(struct inode * if (filp->f_inode->i_cdev == &zcrypt_cdev) { struct zcdn_device *zcdndev; - if (mutex_lock_interruptible(&ap_perms_mutex)) - return -ERESTARTSYS; + mutex_lock(&ap_perms_mutex); zcdndev = find_zcdndev_by_devt(filp->f_inode->i_rdev); mutex_unlock(&ap_perms_mutex); if (zcdndev) {