summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRomain Izard <romain.izard.pro@gmail.com>2018-01-29 11:18:20 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-24 09:29:25 +0200
commit1c9fcf71e31092eff1d2e28ce0e96e918fbab573 (patch)
tree83102d34e7ba2d0b054d9a612ce125cdba555f00 /drivers
parentaee5ff83967e9925c966e595bd3c13d3dff2c515 (diff)
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: 9d54c8a33eec (UBI: R/O block driver on top of UBI volumes) Signed-off-by: Romain Izard <romain.izard.pro@gmail.com> Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/ubi/block.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index 8876c7d3d712..06482fa3eee3 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -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;
}