8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 157f9a9cca0990bf213e5041daaf4641c1764e09 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Sun, 25 Jan 2015 13:28:50 +0100
|
|
Subject: [PATCH 215/506] fs/ntfs: Add sizes sanity checks.
|
|
|
|
Found by: Coverity scan.
|
|
---
|
|
grub-core/fs/ntfs.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
|
|
index 2cbcb0b..6f84688 100644
|
|
--- a/grub-core/fs/ntfs.c
|
|
+++ b/grub-core/fs/ntfs.c
|
|
@@ -920,12 +920,16 @@ grub_ntfs_mount (grub_disk_t disk)
|
|
|
|
if (bpb.clusters_per_mft > 0)
|
|
data->mft_size = ((grub_disk_addr_t) bpb.clusters_per_mft) << data->log_spc;
|
|
+ else if (-bpb.clusters_per_mft < GRUB_NTFS_BLK_SHR || -bpb.clusters_per_mft >= 31)
|
|
+ goto fail;
|
|
else
|
|
data->mft_size = 1ULL << (-bpb.clusters_per_mft - GRUB_NTFS_BLK_SHR);
|
|
|
|
if (bpb.clusters_per_index > 0)
|
|
data->idx_size = (((grub_disk_addr_t) bpb.clusters_per_index)
|
|
<< data->log_spc);
|
|
+ else if (-bpb.clusters_per_index < GRUB_NTFS_BLK_SHR || -bpb.clusters_per_index >= 31)
|
|
+ goto fail;
|
|
else
|
|
data->idx_size = 1ULL << (-bpb.clusters_per_index - GRUB_NTFS_BLK_SHR);
|
|
|
|
--
|
|
2.4.3
|
|
|