Handle I/O errors in exfat_put_node().

[android-x86/external-exfat.git] / libexfat / cluster.c

diff --git a/libexfat/cluster.c b/libexfat/cluster.c
index e84e581..8c61e45 100644 (file)
--- a/libexfat/cluster.c
+++ b/libexfat/cluster.c
@@ -23,6 +23,7 @@
 #include "exfat.h"
 #include <errno.h>
 #include <string.h>
+#include <inttypes.h>
 
 /*
  * Sector to absolute offset.
@@ -82,7 +83,9 @@ cluster_t exfat_next_cluster(const struct exfat* ef,
                return cluster + 1;
        fat_offset = s2o(ef, le32_to_cpu(ef->sb->fat_sector_start))
                + cluster * sizeof(cluster_t);
-       exfat_pread(ef->dev, &next, sizeof(next), fat_offset);
+       if (exfat_pread(ef->dev, &next, sizeof(next), fat_offset) < 0)
+               return EXFAT_CLUSTER_BAD; /* the caller should handle this and print
+                                            appropriate error message */
        return le32_to_cpu(next);
 }
 
@@ -133,28 +136,56 @@ static cluster_t find_bit_and_set(bitmap_t* bitmap, size_t start, size_t end)
        return EXFAT_CLUSTER_END;
 }
 
-void exfat_flush(struct exfat* ef)
+static int flush_nodes(struct exfat* ef, struct exfat_node* node)
 {
+       struct exfat_node* p;
+
+       for (p = node->child; p != NULL; p = p->next)
+       {
+               int rc = flush_nodes(ef, p);
+               if (rc != 0)
+                       return rc;
+       }
+       return exfat_flush_node(ef, node);
+}
+
+int exfat_flush(struct exfat* ef)
+{
+       int rc = flush_nodes(ef, ef->root);
+
        if (ef->cmap.dirty)
        {
-               exfat_pwrite(ef->dev, ef->cmap.chunk, BMAP_SIZE(ef->cmap.chunk_size),
-                               exfat_c2o(ef, ef->cmap.start_cluster));
+               if (exfat_pwrite(ef->dev, ef->cmap.chunk,
+                               BMAP_SIZE(ef->cmap.chunk_size),
+                               exfat_c2o(ef, ef->cmap.start_cluster)) < 0)
+               {
+                       exfat_error("failed to write clusters bitmap");
+                       return -EIO;
+               }
                ef->cmap.dirty = false;
        }
+
+       return rc;
 }
 
-static void set_next_cluster(const struct exfat* ef, bool contiguous,
+static bool set_next_cluster(const struct exfat* ef, bool contiguous,
                cluster_t current, cluster_t next)
 {
        off_t fat_offset;
        le32_t next_le32;
 
        if (contiguous)
-               return;
+               return true;
        fat_offset = s2o(ef, le32_to_cpu(ef->sb->fat_sector_start))
                + current * sizeof(cluster_t);
        next_le32 = cpu_to_le32(next);
-       exfat_pwrite(ef->dev, &next_le32, sizeof(next_le32), fat_offset);
+       if (exfat_pwrite(ef->dev, &next_le32, sizeof(next_le32), fat_offset) < 0)
+       {
+               exfat_error("failed to write the next cluster %#x after %#x", next,
+                               current);
+               return false;
+       }
+       return true;
 }
 
 static cluster_t allocate_cluster(struct exfat* ef, cluster_t hint)
@@ -190,13 +221,15 @@ static void free_cluster(struct exfat* ef, cluster_t cluster)
        ef->cmap.dirty = true;
 }
 
-static void make_noncontiguous(const struct exfat* ef, cluster_t first,
+static bool make_noncontiguous(const struct exfat* ef, cluster_t first,
                cluster_t last)
 {
        cluster_t c;
 
        for (c = first; c < last; c++)
-               set_next_cluster(ef, false, c, c + 1);
+               if (!set_next_cluster(ef, false, c, c + 1))
+                       return false;
+       return true;
 }
 
 static int shrink_file(struct exfat* ef, struct exfat_node* node,
@@ -250,16 +283,20 @@ static int grow_file(struct exfat* ef, struct exfat_node* node,
                {
                        /* it's a pity, but we are not able to keep the file contiguous
                           anymore */
-                       make_noncontiguous(ef, node->start_cluster, previous);
+                       if (!make_noncontiguous(ef, node->start_cluster, previous))
+                               return -EIO;
                        node->flags &= ~EXFAT_ATTRIB_CONTIGUOUS;
                        node->flags |= EXFAT_ATTRIB_DIRTY;
                }
-               set_next_cluster(ef, IS_CONTIGUOUS(*node), previous, next);
+               if (!set_next_cluster(ef, IS_CONTIGUOUS(*node), previous, next))
+                       return -EIO;
                previous = next;
                allocated++;
        }
 
-       set_next_cluster(ef, IS_CONTIGUOUS(*node), previous, EXFAT_CLUSTER_END);
+       if (!set_next_cluster(ef, IS_CONTIGUOUS(*node), previous,
+                       EXFAT_CLUSTER_END))
+               return -EIO;
        return 0;
 }
 
@@ -287,12 +324,15 @@ static int shrink_file(struct exfat* ef, struct exfat_node* node,
                        return -EIO;
                }
                previous = exfat_next_cluster(ef, node, last);
-               set_next_cluster(ef, IS_CONTIGUOUS(*node), last, EXFAT_CLUSTER_END);
+               if (!set_next_cluster(ef, IS_CONTIGUOUS(*node), last,
+                               EXFAT_CLUSTER_END))
+                       return -EIO;
        }
        else
        {
                previous = node->start_cluster;
                node->start_cluster = EXFAT_CLUSTER_FREE;
+               node->flags |= EXFAT_ATTRIB_DIRTY;
        }
        node->fptr_index = 0;
        node->fptr_cluster = node->start_cluster;
@@ -307,17 +347,23 @@ static int shrink_file(struct exfat* ef, struct exfat_node* node,
                        return -EIO;
                }
                next = exfat_next_cluster(ef, node, previous);
-               set_next_cluster(ef, IS_CONTIGUOUS(*node), previous,
-                               EXFAT_CLUSTER_FREE);
+               if (!set_next_cluster(ef, IS_CONTIGUOUS(*node), previous,
+                               EXFAT_CLUSTER_FREE))
+                       return -EIO;
                free_cluster(ef, previous);
                previous = next;
        }
        return 0;
 }
 
-static void erase_raw(struct exfat* ef, size_t size, off_t offset)
+static bool erase_raw(struct exfat* ef, size_t size, off_t offset)
 {
-       exfat_pwrite(ef->dev, ef->zero_cluster, size, offset);
+       if (exfat_pwrite(ef->dev, ef->zero_cluster, size, offset) < 0)
+       {
+               exfat_error("failed to erase %zu bytes at %"PRId64, size, offset);
+               return false;
+       }
+       return true;
 }
 
 static int erase_range(struct exfat* ef, struct exfat_node* node,
@@ -338,8 +384,9 @@ static int erase_range(struct exfat* ef, struct exfat_node* node,
                return -EIO;
        }
        /* erase from the beginning to the closest cluster boundary */
-       erase_raw(ef, MIN(cluster_boundary, end) - begin,
-                       exfat_c2o(ef, cluster) + begin % CLUSTER_SIZE(*ef->sb));
+       if (!erase_raw(ef, MIN(cluster_boundary, end) - begin,
+                       exfat_c2o(ef, cluster) + begin % CLUSTER_SIZE(*ef->sb)))
+               return -EIO;
        /* erase whole clusters */
        while (cluster_boundary < end)
        {
@@ -347,7 +394,8 @@ static int erase_range(struct exfat* ef, struct exfat_node* node,
                /* the cluster cannot be invalid because we have just allocated it */
                if (CLUSTER_INVALID(cluster))
                        exfat_bug("invalid cluster 0x%x after allocation", cluster);
-               erase_raw(ef, CLUSTER_SIZE(*ef->sb), exfat_c2o(ef, cluster));
+               if (!erase_raw(ef, CLUSTER_SIZE(*ef->sb), exfat_c2o(ef, cluster)))
+                       return -EIO;
                cluster_boundary += CLUSTER_SIZE(*ef->sb);
        }
        return 0;