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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 0A849C433DF for ; Tue, 9 Jun 2020 00:18:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E01FB20801 for ; Tue, 9 Jun 2020 00:18:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591661917; bh=BDvc6Ul4JpUEu0xyaXOuBkOI3neeAE1ZCxh7AFG5C6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=plfrbrs5b0jlasJxW5POAonyHXydx7sjcUxM5xPAzGu4Zr38aPHkYDyn9UXqXWo3v FFg636xiY7182fEJOHNokb3qx2kVxbKjvz7EzhhaUfJKexIMkYGs15yM56pabXt/I5 EnOb/cTyPVDJ3ciEBngxSmPTrUoJf9RdjvlZNXsM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731221AbgFIASg (ORCPT ); Mon, 8 Jun 2020 20:18:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:40876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730650AbgFHXSd (ORCPT ); Mon, 8 Jun 2020 19:18:33 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 26F652087E; Mon, 8 Jun 2020 23:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658313; bh=BDvc6Ul4JpUEu0xyaXOuBkOI3neeAE1ZCxh7AFG5C6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z7jWVjEoiHjsISKPLQ2OPolPSV8N3kQ3m3+v3B8VHMz3m/PQmsVJUjj4MXaI/3bsQ 4ywrKhAvjBEFMh0g5yxXp6nD5iPe7c6ktmpk+2khfa/Iqr3yDkE+axfSo6BkAhi8vd 2gmxn3wKu4rSKJIAEvatGME/peGxKN+e158XBqhc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peng Hao , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 314/606] mmc: block: Fix use-after-free issue for rpmb Date: Mon, 8 Jun 2020 19:07:19 -0400 Message-Id: <20200608231211.3363633-314-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608231211.3363633-1-sashal@kernel.org> References: <20200608231211.3363633-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peng Hao [ Upstream commit 202500d21654874aa03243e91f96de153ec61860 ] The data structure member “rpmb->md” was passed to a call of the function “mmc_blk_put” after a call of the function “put_device”. Reorder these function calls to keep the data accesses consistent. Fixes: 1c87f7357849 ("mmc: block: Fix bug when removing RPMB chardev ") Signed-off-by: Peng Hao Cc: stable@vger.kernel.org [Uffe: Fixed up mangled patch and updated commit message] Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/core/block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 32db16f6debc..2d19291ebc84 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -2475,8 +2475,8 @@ static int mmc_rpmb_chrdev_release(struct inode *inode, struct file *filp) struct mmc_rpmb_data *rpmb = container_of(inode->i_cdev, struct mmc_rpmb_data, chrdev); - put_device(&rpmb->dev); mmc_blk_put(rpmb->md); + put_device(&rpmb->dev); return 0; } -- 2.25.1