Commit ce36c8b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ubifs-for-linus-6.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs 

Pull UBI fix from Richard Weinberger:

 - Don't try to attach MTDs with erase block size 0

* tag 'ubifs-for-linus-6.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubi: Refuse attaching if mtd's erasesize is 0
parents a9c2be4f 017c73a3

drivers/mtd/ubi/build.c

+7 −0
Original line number Diff line number Diff line
@@ -894,6 +894,13 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
		return -EINVAL;

	}



	/* UBI cannot work on flashes with zero erasesize. */

	if (!mtd->erasesize) {

		pr_err("ubi: refuse attaching mtd%d - zero erasesize flash is not supported\n",

			mtd->index);

		return -EINVAL;

	}



	if (ubi_num == UBI_DEV_NUM_AUTO) {

		/* Search for an empty slot in the @ubi_devices array */

		for (ubi_num = 0; ubi_num < UBI_MAX_DEVICES; ubi_num++)