fat: Fix possible null deref in fat_cache_add()
authorOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Tue, 12 Apr 2011 12:08:38 +0000 (21:08 +0900)
committerOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Tue, 12 Apr 2011 12:12:16 +0000 (21:12 +0900)
Reported-by: <dame_eugene@mail.ru>
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
fs/fat/cache.c

index ae8200f..1cc7038 100644 (file)
@@ -151,6 +151,13 @@ static void fat_cache_add(struct inode *inode, struct fat_cache_id *new)
                        spin_unlock(&MSDOS_I(inode)->cache_lru_lock);
 
                        tmp = fat_cache_alloc(inode);
+                       if (!tmp) {
+                               spin_lock(&MSDOS_I(inode)->cache_lru_lock);
+                               MSDOS_I(inode)->nr_caches--;
+                               spin_unlock(&MSDOS_I(inode)->cache_lru_lock);
+                               return;
+                       }
+
                        spin_lock(&MSDOS_I(inode)->cache_lru_lock);
                        cache = fat_cache_merge(inode, new);
                        if (cache != NULL) {