Commit e8c2f9fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-7.1/hpfs-fixes' of... 

Merge tag 'for-7.1/hpfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull hpfs fix from Mikulas Patocka:

 - Fix a crash on corrupted filesystem

* tag 'for-7.1/hpfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  hpfs: fix a crash if hpfs_map_dnode_bitmap fails
parents 13e4d257 974820a5

fs/hpfs/alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -372,8 +372,8 @@ int hpfs_check_free_dnodes(struct super_block *s, int n) 
				return 0;

			}

		}

	}

		hpfs_brelse4(&qbh);

	}

	i = 0;

	if (hpfs_sb(s)->sb_c_bitmap != -1) {

		bmp = hpfs_map_bitmap(s, b, &qbh, "chkdn1");