diff options
author | Adam Thomas <adamthomas1111@gmail.com> | 2013-02-02 17:35:08 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2013-02-04 05:31:48 -0500 |
commit | 8afd500cb52a5d00bab4525dd5a560d199f979b9 (patch) | |
tree | 91ee2f6917c1f84300308dc6e659865cae89a3cc /fs/ubifs/ubifs.h | |
parent | 2928f0d0c5ebd6c9605c0d98207a44376387c298 (diff) |
UBIFS: fix double free of ubifs_orphan objects
The last orphan in the dnext list has its dnext set to NULL. Because
of that, ubifs_delete_orphan assumes that it is not on the dnext list
and frees it immediately instead ignoring it as a second delete. The
orphan is later freed again by erase_deleted.
This change adds an explicit flag to ubifs_orphan indicating whether
it is pending delete.
Signed-off-by: Adam Thomas <adamthomas1111@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ubifs/ubifs.h')
-rw-r--r-- | fs/ubifs/ubifs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index c16fff7271d3..b2babce4d70f 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h | |||
@@ -905,6 +905,7 @@ struct ubifs_budget_req { | |||
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 | * @cmt: %1 => commit pending, otherwise %0 |
908 | * @del: %1 => delete pending, otherwise %0 | ||
908 | */ | 909 | */ |
909 | struct ubifs_orphan { | 910 | struct ubifs_orphan { |
910 | struct rb_node rb; | 911 | struct rb_node rb; |
@@ -915,6 +916,7 @@ struct ubifs_orphan { | |||
915 | ino_t inum; | 916 | ino_t inum; |
916 | unsigned new:1; | 917 | unsigned new:1; |
917 | unsigned cmt:1; | 918 | unsigned cmt:1; |
919 | unsigned del:1; | ||
918 | }; | 920 | }; |
919 | 921 | ||
920 | /** | 922 | /** |