Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2786614ybg; Mon, 28 Oct 2019 02:20:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqypEGEzb/Sz6AmqvHQTGqrS7v2uAus6kBEUIAVrSlabESi4E0Nb6Os2sF9yvNt07+9hEQ0C X-Received: by 2002:aa7:db17:: with SMTP id t23mr18284973eds.135.1572254447073; Mon, 28 Oct 2019 02:20:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572254447; cv=none; d=google.com; s=arc-20160816; b=qlShFhviWwe6dMmgKkxsJke2LFVZB5d4eM8jl0vYpDcZNA/Nz6bgWbrOaoB6/ZPqXL BKhFO+eHXGEhDvw1HJDTGP25j+U2xLe0rIf+LtZ6P1o8Q63hs9uQvEsWEe9u8qqevgyE AF9EIsZ1WqaaoMqPWlWpPTRA5pr7L0waWbOtrj7lC+MjQ0LoyIq+EwKheIlAs03dAMIT /n77XngIFoJLzDg8yGlfXHT23u+YSidqY6NXZtkTfknx/KYj7Gz65+yoSwHH4u20DqrJ NDFMFIvLV6vpgOCu1WlVyVy8h++VDWQhbGOcYOKB1HhlzCHCYQW2OuuYq8R+S27XMjiR MV0w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RUCaGl+y3tcuMPsvyaXYZZDMlyzMx/VtBdxFcI3nhok=; b=iavkAaHJf/ck+GCha0hLYyDu6UZJVz9SF4q9C460KWS7LRcuSXujSZBGJgtwGtpG9L AEnGJqu9P0YLSg9Se1jB6VxyIT0d5sBD3Bg0LxaBXF/XA3IHNb2zp6C63SKDUIkyizd2 ZThYN+CpgFYGYbQYaffqfuiLygiicnljKhSh8ngP7lgxjRB55UZib7ttxLB4juGHW8hy f4Bw2sh2uARjxp8n+opWAabKrDEd+Hy+v2PtAjzbq4ltbRn/cy7wuYsIT3OLjl+7it5g N/0Ss6FGF7oxkqubeFAp4ZqfYFP/QfEzS2RGF01EOYRSxpxaQRPpNLKbr9jtbgVQaler IBHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AJux7bHx; 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 v13si8712968edb.164.2019.10.28.02.20.24; Mon, 28 Oct 2019 02:20:47 -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=@kernel.org header.s=default header.b=AJux7bHx; 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 S1732483AbfJ0VYS (ORCPT + 99 others); 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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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) {