summaryrefslogtreecommitdiffstats
path: root/fs/omfs/inode.c
diff options
context:
space:
mode:
authorBob Copeland <me@bobcopeland.com>2015-05-28 15:44:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-28 18:25:19 -0700
commitc0345ee57d461343586b5e1e2f9c3c3766d07fe6 (patch)
treebd81e1024685902b89855d40aff995a89acb17b3 /fs/omfs/inode.c
parent3a281f946640542a7a7372f436e101ee1fbc4c97 (diff)
downloadlinux-c0345ee57d461343586b5e1e2f9c3c3766d07fe6.tar.bz2
omfs: fix sign confusion for bitmap loop counter
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>
Diffstat (limited to 'fs/omfs/inode.c')
-rw-r--r--fs/omfs/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index 6ce542c11f98..3d935c81789a 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;