lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 14 Oct 2013 14:41:48 +0300 From: Artem Bityutskiy <dedekind1@...il.com> To: Davidlohr Bueso <davidlohr@...com>, Matt Fleming <matt.fleming@...el.com>, Andrew Morton <akpm@...ux-foundation.org> Cc: Artem Bityutskiy <artem.bityutskiy@...ux.intel.com>, Karel Zak <kzak@...hat.com>, Linux Kernel Maling List <linux-kernel@...r.kernel.org> Subject: [PATCH 1/2 for 3.12-rc6] Revert "partitions/efi: loosen check fot pmbr size in lba" From: Artem Bityutskiy <artem.bityutskiy@...ux.intel.com> This reverts commit 6b02fa59a7cf34c548eedee657b07ea6c54d3894. This commit is fixing a commit which is going to be reverted. So revert this one too since it becomes unneeded. Signed-off-by: Artem Bityutskiy <artem.bityutskiy@...ux.intel.com> --- block/partitions/efi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/block/partitions/efi.c b/block/partitions/efi.c index 1eb09ee..1a5ec9a 100644 --- a/block/partitions/efi.c +++ b/block/partitions/efi.c @@ -186,7 +186,6 @@ invalid: */ static int is_pmbr_valid(legacy_mbr *mbr, sector_t total_sectors) { - uint32_t sz = 0; int i, part = 0, ret = 0; /* invalid by default */ if (!mbr || le16_to_cpu(mbr->signature) != MSDOS_MBR_SIGNATURE) @@ -217,15 +216,12 @@ check_hybrid: /* * Protective MBRs take up the lesser of the whole disk * or 2 TiB (32bit LBA), ignoring the rest of the disk. - * Some partitioning programs, nonetheless, choose to set - * the size to the maximum 32-bit limitation, disregarding - * the disk size. * * Hybrid MBRs do not necessarily comply with this. */ if (ret == GPT_MBR_PROTECTIVE) { - sz = le32_to_cpu(mbr->partition_record[part].size_in_lba); - if (sz != (uint32_t) total_sectors - 1 && sz != 0xFFFFFFFF) + if (le32_to_cpu(mbr->partition_record[part].size_in_lba) != + min((uint32_t) total_sectors - 1, 0xFFFFFFFF)) ret = 0; } done: -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists