From bb147e4f4008b5debde0f87282967a5e52d2d50f Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 7 Oct 2014 12:44:34 +0200 Subject: [PATCH 181/185] libblkid: zeroize errno on blkid_probe_get_buffer() success Since 37f4060225df0591ab8e1dd676dbc8115d900d4f prober functions are sensitive to errno, it seems more robust to set errno=0 with in blkid_probe_get_buffer() on success than set the zero on all places where we call blkid_probe_get_buffer(). Addresses: https://github.com/karelzak/util-linux/issues/119 Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1632944 Upstream: http://github.com/karelzak/util-linux/commit/00749bc366fe6106df918660a92a388cfff4f35f Signed-off-by: Karel Zak --- libblkid/src/probe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c index 07b08441f..ef0a72299 100644 --- a/libblkid/src/probe.c +++ b/libblkid/src/probe.c @@ -529,8 +529,10 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, struct list_head *p; struct blkid_bufinfo *bf = NULL; - if (pr->size <= 0) + if (pr->size <= 0) { + errno = EINVAL; return NULL; + } if (pr->parent && pr->parent->devno == pr->devno && @@ -598,6 +600,7 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, list_add_tail(&bf->bufs, &pr->buffers); } + errno = 0; return off ? bf->data + (off - bf->off) : bf->data; } -- 2.20.1