forked from pool/util-linux
279b07414a
- Enable socket activation needed by systemd service (bnc#872807). - libblkid: Drop the broken ext2/ext3/ext4 discrimination logic (util-linux-libblkid-ext-probe.patch, bnc#864703). - Abort blkid probing on I/O errors (bnc#859062, blkid-stop-scanning-on-I-O-error.patch, blkid-convert-superblocks-to-new-calling-convention.patch, http://www.spinics.net/lists/util-linux-ng/msg08976.html) (forwarded request 230696 from sbrabec) OBS-URL: https://build.opensuse.org/request/show/230697 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=184
139 lines
4.4 KiB
Diff
139 lines
4.4 KiB
Diff
From 65245d440656a8df4352f9a5b9ec047bf4b6a663 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Tue, 21 Jan 2014 09:16:46 +0100
|
|
Subject: [PATCH] blkid: stop scanning on I/O error
|
|
|
|
Whenever we fail to read from a device it's pointless to
|
|
continue with probing; we should be failing immediately.
|
|
Otherwise the system will continue logging I/O errors.
|
|
|
|
This patch updates the probe functions to return -1
|
|
on error and 1 if not found.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
libblkid/src/partitions/partitions.c | 13 +++++++++----
|
|
libblkid/src/probe.c | 13 +++++++++++--
|
|
libblkid/src/superblocks/superblocks.c | 13 ++++++++++---
|
|
3 files changed, 30 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
|
|
index 6c915d9..98baece 100644
|
|
--- a/libblkid/src/partitions/partitions.c
|
|
+++ b/libblkid/src/partitions/partitions.c
|
|
@@ -540,7 +540,8 @@ static int idinfo_probe(blkid_probe pr, const struct blkid_idinfo *id,
|
|
if (pr->size <= 0 || (id->minsz && id->minsz > pr->size))
|
|
goto nothing; /* the device is too small */
|
|
|
|
- if (blkid_probe_get_idmag(pr, id, &off, &mag))
|
|
+ rc = blkid_probe_get_idmag(pr, id, &off, &mag);
|
|
+ if (rc != 0)
|
|
goto nothing;
|
|
|
|
/* final check by probing function */
|
|
@@ -548,12 +549,13 @@ static int idinfo_probe(blkid_probe pr, const struct blkid_idinfo *id,
|
|
DBG(LOWPROBE, blkid_debug(
|
|
"%s: ---> call probefunc()", id->name));
|
|
rc = id->probefunc(pr, mag);
|
|
- if (rc == -1) {
|
|
+ if (rc != 0) {
|
|
/* reset after error */
|
|
reset_partlist(blkid_probe_get_partlist(pr));
|
|
if (chn && !chn->binary)
|
|
blkid_probe_chain_reset_vals(pr, chn);
|
|
- DBG(LOWPROBE, blkid_debug("%s probefunc failed", id->name));
|
|
+ DBG(LOWPROBE, blkid_debug("%s probefunc failed, rc %d",
|
|
+ id->name, rc));
|
|
}
|
|
if (rc == 0 && mag && chn && !chn->binary)
|
|
rc = blkid_probe_set_magic(pr, off, mag->len,
|
|
@@ -599,7 +601,10 @@ static int partitions_probe(blkid_probe pr, struct blkid_chain *chn)
|
|
continue;
|
|
|
|
/* apply checks from idinfo */
|
|
- if (idinfo_probe(pr, idinfos[i], chn) != 0)
|
|
+ rc = idinfo_probe(pr, idinfos[i], chn);
|
|
+ if (rc < 0)
|
|
+ return rc;
|
|
+ if (rc > 0)
|
|
continue;
|
|
|
|
name = idinfos[i]->name;
|
|
diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
|
|
index 4b0c997..452c743 100644
|
|
--- a/libblkid/src/probe.c
|
|
+++ b/libblkid/src/probe.c
|
|
@@ -569,13 +569,17 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr,
|
|
if (!bf) {
|
|
ssize_t ret;
|
|
|
|
- if (blkid_llseek(pr->fd, pr->off + off, SEEK_SET) < 0)
|
|
+ if (blkid_llseek(pr->fd, pr->off + off, SEEK_SET) < 0) {
|
|
+ errno = 0;
|
|
return NULL;
|
|
+ }
|
|
|
|
/* allocate info and space for data by why call */
|
|
bf = calloc(1, sizeof(struct blkid_bufinfo) + len);
|
|
- if (!bf)
|
|
+ if (!bf) {
|
|
+ errno = 0;
|
|
return NULL;
|
|
+ }
|
|
|
|
bf->data = ((unsigned char *) bf) + sizeof(struct blkid_bufinfo);
|
|
bf->len = len;
|
|
@@ -587,7 +591,10 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr,
|
|
|
|
ret = read(pr->fd, bf->data, len);
|
|
if (ret != (ssize_t) len) {
|
|
+ DBG(LOWPROBE, blkid_debug("\tbuffer read: return %d error %d", ret, errno));
|
|
free(bf);
|
|
+ if (ret >= 0 || errno != EIO)
|
|
+ errno = 0;
|
|
return NULL;
|
|
}
|
|
list_add_tail(&bf->bufs, &pr->buffers);
|
|
@@ -794,6 +801,8 @@ int blkid_probe_get_idmag(blkid_probe pr, const struct blkid_idinfo *id,
|
|
off = (mag->kboff + (mag->sboff >> 10)) << 10;
|
|
buf = blkid_probe_get_buffer(pr, off, 1024);
|
|
|
|
+ if (!buf && errno)
|
|
+ return -1;
|
|
if (buf && !memcmp(mag->magic,
|
|
buf + (mag->sboff & 0x3ff), mag->len)) {
|
|
DBG(LOWPROBE, blkid_debug("\tmagic sboff=%u, kboff=%ld",
|
|
diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
|
|
index 565daf2..ad93b4e 100644
|
|
--- a/libblkid/src/superblocks/superblocks.c
|
|
+++ b/libblkid/src/superblocks/superblocks.c
|
|
@@ -380,15 +380,22 @@ static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn)
|
|
|
|
DBG(LOWPROBE, blkid_debug("[%zd] %s:", i, id->name));
|
|
|
|
- if (blkid_probe_get_idmag(pr, id, &off, &mag))
|
|
+ rc = blkid_probe_get_idmag(pr, id, &off, &mag);
|
|
+ if (rc < 0)
|
|
+ break;
|
|
+ if (rc > 0)
|
|
continue;
|
|
|
|
/* final check by probing function */
|
|
if (id->probefunc) {
|
|
DBG(LOWPROBE, blkid_debug("\tcall probefunc()"));
|
|
- if (id->probefunc(pr, mag) != 0) {
|
|
+ rc = id->probefunc(pr, mag);
|
|
+ if (rc != 0) {
|
|
blkid_probe_chain_reset_vals(pr, chn);
|
|
- continue;
|
|
+ if (rc < 0)
|
|
+ break;
|
|
+ else
|
|
+ continue;
|
|
}
|
|
}
|
|
|
|
--
|
|
1.8.1.4
|
|
|