diff options
author | Adam Thomas <adamthomas1111@gmail.com> | 2013-02-02 17:32:31 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2013-02-04 05:31:00 -0500 |
commit | 2928f0d0c5ebd6c9605c0d98207a44376387c298 (patch) | |
tree | e15d676a7c9f493853c0fbbab1ed2e71cf5fc0c6 /fs/ubifs/ubifs.h | |
parent | 3d251a5b9e2f09edcf25bbffe1fa308d0f648bf1 (diff) |
UBIFS: fix use of freed ubifs_orphan objects
The last orphan in the cnext list has its cnext set to NULL. Because
of that, ubifs_delete_orphan assumes that it is not on the cnext list
and frees it immediately instead of adding it to the dnext list. The
freed orphan is later modified by write_orph_node.
This can cause various inconsistencies including directory entries
that cannot be removed and this error:
UBIFS error (pid 20685): layout_cnodes: LPT out of space at LEB 14:129009 needing 17, done_ltab 1, done_lsave 1
This is a regression introduced by
"7074e5eb UBIFS: remove invalid reference to list iterator variable".
This change adds an explicit flag to ubifs_orphan indicating whether
it is pending commit.
Signed-off-by: Adam Thomas <adamthomas1111@gmail.com>
Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org # v3.6+
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'fs/ubifs/ubifs.h')
-rw-r--r-- | fs/ubifs/ubifs.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index d133c276fe05..c16fff7271d3 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h | |||
@@ -904,6 +904,7 @@ struct ubifs_budget_req { | |||
904 | * @dnext: next orphan to delete | 904 | * @dnext: next orphan to delete |
905 | * @inum: inode number | 905 | * @inum: inode number |
906 | * @new: %1 => added since the last commit, otherwise %0 | 906 | * @new: %1 => added since the last commit, otherwise %0 |
907 | * @cmt: %1 => commit pending, otherwise %0 | ||
907 | */ | 908 | */ |
908 | struct ubifs_orphan { | 909 | struct ubifs_orphan { |
909 | struct rb_node rb; | 910 | struct rb_node rb; |
@@ -912,7 +913,8 @@ struct ubifs_orphan { | |||
912 | struct ubifs_orphan *cnext; | 913 | struct ubifs_orphan *cnext; |
913 | struct ubifs_orphan *dnext; | 914 | struct ubifs_orphan *dnext; |
914 | ino_t inum; | 915 | ino_t inum; |
915 | int new; | 916 | unsigned new:1; |
917 | unsigned cmt:1; | ||
916 | }; | 918 | }; |
917 | 919 | ||
918 | /** | 920 | /** |