Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c9fcf71 authored by Romain Izard's avatar Romain Izard Committed by Greg Kroah-Hartman
Browse files

ubi: Fix error for write access 



commit 78a8dfbabbece22bee58ac4cb26cab10e7a19c5d upstream.

When opening a device with write access, ubiblock_open returns an error
code. Currently, this error code is -EPERM, but this is not the right
value.

The open function for other block devices returns -EROFS when opening
read-only devices with FMODE_WRITE set. When used with dm-verity, the
veritysetup userspace tool is expecting EROFS, and refuses to use the
ubiblock device.

Use -EROFS for ubiblock as well. As a result, veritysetup accepts the
ubiblock device as valid.

Cc: stable@vger.kernel.org
Fixes: 9d54c8a3 (UBI: R/O block driver on top of UBI volumes)
Signed-off-by: default avatarRomain Izard <romain.izard.pro@gmail.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aee5ff83

drivers/mtd/ubi/block.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int ubiblock_open(struct block_device *bdev, fmode_t mode) 
	 * in any case.

	 */

	if (mode & FMODE_WRITE) {

		ret = -EPERM;

		ret = -EROFS;

		goto out_unlock;

	}