From: Eric Sandeen Date: Fri, 18 Apr 2008 15:28:44 +0000 (-0500) Subject: blkid: more sanity checks for swap v1 X-Git-Tag: v1.41-WIP-0427~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6360d129d003f25942f62fab2cdc5e1d97cc88a6;p=thirdparty%2Fe2fsprogs.git blkid: more sanity checks for swap v1 mkswap followed by pvcreate on a block device will still turn up as "swap" in blkid, because pvcreate isn't particularly careful about zeroing old signatures. (neither is mkswap, for that matter). Testing for appropriate version and page counts gives us a bit more confidence that we have a real swap (v1) partition. Signed-off-by: Eric Sandeen Signed-off-by: Theodore Ts'o --- diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index 45885c390..4347ae1f7 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -827,7 +827,7 @@ static int probe_swap0(struct blkid_probe *probe, } static int probe_swap1(struct blkid_probe *probe, - struct blkid_magic *id __BLKID_ATTR((unused)), + struct blkid_magic *id, unsigned char *buf __BLKID_ATTR((unused))) { struct swap_id_block *sws; @@ -843,6 +843,12 @@ static int probe_swap1(struct blkid_probe *probe, if (!sws) return 1; + /* check for wrong version or zeroed pagecount, for sanity */ + if (!memcmp(id->bim_magic, "SWAPSPACE2", id->bim_len) && + (blkid_le32(sws->sws_version) != 1 || + sws->sws_lastpage == 0)) + return 1; + /* arbitrary sanity check.. is there any garbage down there? */ if (sws->sws_pad[32] == 0 && sws->sws_pad[33] == 0) { if (sws->sws_volume[0])