ubifs: Check ubifs_wbuf_sync() return code
authorRichard Weinberger <richard@nod.at>
Wed, 17 Jan 2018 18:12:42 +0000 (19:12 +0100)
committerRichard Weinberger <richard@nod.at>
Wed, 4 Apr 2018 21:41:44 +0000 (23:41 +0200)
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: 1e51764a3c2a ("UBIFS: add new flash file system")
Signed-off-by: Richard Weinberger <richard@nod.at>
fs/ubifs/super.c

index b16ef162344ab382143578d277248c88f2fdc067..6c397a389105a68f75b6c3dbaba9d7bf3e01c5af 100644 (file)
@@ -1737,8 +1737,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);
@@ -1804,8 +1807,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