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

Commit aee5ff83 authored by Richard Weinberger's avatar Richard Weinberger Committed by Greg Kroah-Hartman
Browse files

ubifs: Check ubifs_wbuf_sync() return code 



commit aac17948a7ce01fb60b9ee6cf902967a47b3ce26 upstream.

If ubifs_wbuf_sync() fails we must not write a master node with the
dirty marker cleared.
Otherwise it is possible that in case of an IO error while syncing we
mark the filesystem as clean and UBIFS refuses to recover upon next
mount.

Cc: <stable@vger.kernel.org>
Fixes: 1e51764a ("UBIFS: add new flash file system")
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51509ce0

fs/ubifs/super.c

+10 −4
Original line number Diff line number Diff line
@@ -1726,8 +1726,11 @@ static void ubifs_remount_ro(struct ubifs_info *c) 


	dbg_save_space_info(c);



	for (i = 0; i < c->jhead_cnt; i++)

		ubifs_wbuf_sync(&c->jheads[i].wbuf);

	for (i = 0; i < c->jhead_cnt; i++) {

		err = ubifs_wbuf_sync(&c->jheads[i].wbuf);

		if (err)

			ubifs_ro_mode(c, err);

	}



	c->mst_node->flags &= ~cpu_to_le32(UBIFS_MST_DIRTY);

	c->mst_node->flags |= cpu_to_le32(UBIFS_MST_NO_ORPHS);
@@ -1794,8 +1797,11 @@ static void ubifs_put_super(struct super_block *sb) 
			int err;



			/* Synchronize write-buffers */

			for (i = 0; i < c->jhead_cnt; i++)

				ubifs_wbuf_sync(&c->jheads[i].wbuf);

			for (i = 0; i < c->jhead_cnt; i++) {

				err = ubifs_wbuf_sync(&c->jheads[i].wbuf);

				if (err)

					ubifs_ro_mode(c, err);

			}



			/*

			 * We are being cleanly unmounted which means the