diff options
| author | Bob Copeland <me@bobcopeland.com> | 2015-05-28 15:44:35 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-06-09 13:43:51 -0400 |
| commit | 45948a314fb5d29f92b8537dcf54888ed78bcecc (patch) | |
| tree | e7c673728c8234d44551c3fa67b73308c6cf344b /fs/omfs | |
| parent | ce8d4a6371aa570bbe7ecaf618868cc4f6d5b437 (diff) | |
omfs: fix sign confusion for bitmap loop counter
[ Upstream commit c0345ee57d461343586b5e1e2f9c3c3766d07fe6 ]
The count variable is used to iterate down to (below) zero from the size
of the bitmap and handle the one-filling the remainder of the last
partial bitmap block. The loop conditional expects count to be signed
in order to detect when the final block is processed, after which count
goes negative.
Unfortunately, a recent change made this unsigned along with some other
related fields. The result of is this is that during mount,
omfs_get_imap will overrun the bitmap array and corrupt memory unless
number of blocks happens to be a multiple of 8 * blocksize.
Fix by changing count back to signed: it is guaranteed to fit in an s32
without overflow due to an enforced limit on the number of blocks in the
filesystem.
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs/omfs')
| -rw-r--r-- | fs/omfs/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c index 70d4191cf33d..454111a3308e 100644 --- a/fs/omfs/inode.c +++ b/fs/omfs/inode.c @@ -306,7 +306,8 @@ static const struct super_operations omfs_sops = { */ static int omfs_get_imap(struct super_block *sb) { - unsigned int bitmap_size, count, array_size; + unsigned int bitmap_size, array_size; + int count; struct omfs_sb_info *sbi = OMFS_SB(sb); struct buffer_head *bh; unsigned long **ptr; |