lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 13 Jun 2021 19:30:30 +0800 From: Zhihao Cheng <chengzhihao1@...wei.com> To: <miquel.raynal@...tlin.com>, <richard@....at>, <vigneshr@...com> CC: <linux-mtd@...ts.infradead.org>, <linux-kernel@...r.kernel.org>, <chengzhihao1@...wei.com>, <yukuai3@...wei.com> Subject: [PATCH 1/6] Revert "mtd: blkdevs: fix potential deadlock + lockdep warnings" This reverts commit f3c63795e90f0c6238306883b6c72f14d5355721. --- drivers/mtd/mtd_blkdevs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index fb8e12d590a1..16ccce3e7fdb 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -209,8 +209,8 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) if (!dev) return -ERESTARTSYS; /* FIXME: busy loop! -arnd*/ - mutex_lock(&mtd_table_mutex); mutex_lock(&dev->lock); + mutex_lock(&mtd_table_mutex); if (dev->open) goto unlock; @@ -234,8 +234,8 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) unlock: dev->open++; - mutex_unlock(&dev->lock); mutex_unlock(&mtd_table_mutex); + mutex_unlock(&dev->lock); blktrans_dev_put(dev); return ret; @@ -245,8 +245,8 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) error_put: module_put(dev->tr->owner); kref_put(&dev->ref, blktrans_dev_release); - mutex_unlock(&dev->lock); mutex_unlock(&mtd_table_mutex); + mutex_unlock(&dev->lock); blktrans_dev_put(dev); return ret; } @@ -258,8 +258,8 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode) if (!dev) return; - mutex_lock(&mtd_table_mutex); mutex_lock(&dev->lock); + mutex_lock(&mtd_table_mutex); if (--dev->open) goto unlock; @@ -273,8 +273,8 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode) __put_mtd_device(dev->mtd); } unlock: - mutex_unlock(&dev->lock); mutex_unlock(&mtd_table_mutex); + mutex_unlock(&dev->lock); blktrans_dev_put(dev); } -- 2.31.1
Powered by blists - more mailing lists