You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.7 KiB
46 lines
1.7 KiB
7 years ago
|
From e2353e7c13808e47efb844f8fb10b7aa2142e619 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Fri, 13 Mar 2015 21:10:13 -0500
|
||
|
|
Subject: [PATCH] gpt-auto-generator: allow type check to fail
|
||
|
|
|
||
|
|
add_mount() is OK with unknow file type, but we have to initalize
|
||
|
|
the variable to NULL not to pass garbage on error.
|
||
|
|
|
||
|
|
(cherry picked from commit a0b1209c4a59754f428894e0485413542da50014)
|
||
|
|
---
|
||
|
|
src/gpt-auto-generator/gpt-auto-generator.c | 13 +++++--------
|
||
|
|
1 file changed, 5 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
|
||
|
|
index cceeeb845..00a2141a5 100644
|
||
|
|
--- a/src/gpt-auto-generator/gpt-auto-generator.c
|
||
|
|
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
|
||
|
|
@@ -291,7 +291,7 @@ static int probe_and_add_mount(
|
||
|
|
const char *post) {
|
||
|
|
|
||
|
|
_cleanup_blkid_free_probe_ blkid_probe b = NULL;
|
||
|
|
- const char *fstype;
|
||
|
|
+ const char *fstype = NULL;
|
||
|
|
int r;
|
||
|
|
|
||
|
|
assert(id);
|
||
|
|
@@ -324,14 +324,11 @@ static int probe_and_add_mount(
|
||
|
|
r = blkid_do_safeprobe(b);
|
||
|
|
if (r == -2 || r == 1) /* no result or uncertain */
|
||
|
|
return 0;
|
||
|
|
- else if (r != 0) {
|
||
|
|
- if (errno == 0)
|
||
|
|
- errno = EIO;
|
||
|
|
- log_error_errno(errno, "Failed to probe %s: %m", what);
|
||
|
|
- return -errno;
|
||
|
|
- }
|
||
|
|
+ else if (r != 0)
|
||
|
|
+ return log_error_errno(errno ?: EIO, "Failed to probe %s: %m", what);
|
||
|
|
|
||
|
|
- blkid_probe_lookup_value(b, "TYPE", &fstype, NULL);
|
||
|
|
+ /* add_mount is OK with fstype being NULL. */
|
||
|
|
+ (void) blkid_probe_lookup_value(b, "TYPE", &fstype, NULL);
|
||
|
|
|
||
|
|
return add_mount(
|
||
|
|
id,
|