From: Matthias König <mk@phasorlab.de>
Date: Tue, 12 Jan 2010 12:58:28 +0000 (+0100)
Subject: libblkid: fix segfault in drdb
X-Git-Tag: v2.18-rc1~281
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10f494e1a0ac09e144a42fcaeb72663674eb30fc;p=thirdparty%2Futil-linux.git

libblkid: fix segfault in drdb

Check if blkid_probe_get_buffer() returns NULL to avoid dereferencing
a zero pointer resulting in a segfault.

Signed-off-by: Matthias König <mk@phasorlab.de>
---

diff --git a/shlibs/blkid/src/superblocks/drbd.c b/shlibs/blkid/src/superblocks/drbd.c
index e0bbb4d669..a56486e979 100644
--- a/shlibs/blkid/src/superblocks/drbd.c
+++ b/shlibs/blkid/src/superblocks/drbd.c
@@ -78,7 +78,8 @@ static int probe_drbd(blkid_probe pr, const struct blkid_idmag *mag)
 		blkid_probe_get_buffer(pr,
 		off,
 		sizeof(struct md_on_disk_08));
-
+	if (!md)
+		return -1;
 
 	if (be32_to_cpu(md->magic) != DRBD_MD_MAGIC_08)
 		return -1;