malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[LogFS] Prevent mempool_destroy NULL pointer dereference

Browse Source 
It would probably be better to just accept NULL pointers in
mempool_destroy().  But for the current -rc series let's keep things
simple.

This patch was lost in the cracks for a while.
Kevin Cernekee <cernekee@gmail.com> had to rediscover the problem and
send a similar patch because of it. :(

Signed-off-by: Joern Engel <joern@logfs.org>
This commit is contained in:
Joern Engel 2010-04-15 08:03:57 +02:00
parent ead88af5f5
commit 1f1b0008e8
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/logfs/logfs.h
View File

@ -727,4 +727,10 @@ static inline struct logfs_area *get_area(struct super_block *sb,
return logfs_super(sb)->s_area[(__force u8)gc_level]; return logfs_super(sb)->s_area[(__force u8)gc_level];
} }
static inline void logfs_mempool_destroy(mempool_t *pool)
{
if (pool)
mempool_destroy(pool);
}
#endif #endif

6
fs/logfs/readwrite.c
View File

@ -2243,8 +2243,6 @@ void logfs_cleanup_rw(struct super_block *sb)
struct logfs_super *super = logfs_super(sb); struct logfs_super *super = logfs_super(sb);
destroy_meta_inode(super->s_segfile_inode); destroy_meta_inode(super->s_segfile_inode);
if (super->s_block_pool) logfs_mempool_destroy(super->s_block_pool);
mempool_destroy(super->s_block_pool); logfs_mempool_destroy(super->s_shadow_pool);
if (super->s_shadow_pool)
mempool_destroy(super->s_shadow_pool);
} }

2
fs/logfs/segment.c
View File

@ -912,7 +912,7 @@ err:
for (i--; i >= 0; i--) for (i--; i >= 0; i--)
free_area(super->s_area[i]); free_area(super->s_area[i]);
free_area(super->s_journal_area); free_area(super->s_journal_area);
mempool_destroy(super->s_alias_pool); logfs_mempool_destroy(super->s_alias_pool);
return -ENOMEM; return -ENOMEM;
} }

4
fs/logfs/super.c
View File

@ -517,8 +517,8 @@ static void logfs_kill_sb(struct super_block *sb)
if (super->s_erase_page) if (super->s_erase_page)
__free_page(super->s_erase_page); __free_page(super->s_erase_page);
super->s_devops->put_device(sb); super->s_devops->put_device(sb);
mempool_destroy(super->s_btree_pool); logfs_mempool_destroy(super->s_btree_pool);
mempool_destroy(super->s_alias_pool); logfs_mempool_destroy(super->s_alias_pool);
kfree(super); kfree(super);
log_super("LogFS: Finished unmounting\n"); log_super("LogFS: Finished unmounting\n");
} }