From: Karel Zak <kzak@redhat.com>
Date: Wed, 28 Jan 2015 14:10:15 +0000 (+0100)
Subject: libfdisk: (gpt) check return from GUID parser [coverity scan]
X-Git-Tag: v2.26-rc2~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4044d24468fc59806500ecf2f356ceadfbd5cd8e;p=thirdparty%2Futil-linux.git

libfdisk: (gpt) check return from GUID parser [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index e7b58f3983..f1e4a65e7f 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -303,8 +303,10 @@ static void swap_efi_guid(struct gpt_guid *uid)
 
 static int string_to_guid(const char *in, struct gpt_guid *guid)
 {
-	if (uuid_parse(in, (unsigned char *) guid))	/* BE */
-		return -1;
+	if (uuid_parse(in, (unsigned char *) guid)) {   /* BE */
+		DBG(LABEL, ul_debug("GPT: failed to parse GUID: %s", in));
+		return -EINVAL;
+	}
 	swap_efi_guid(guid);				/* LE */
 	return 0;
 }
@@ -1979,9 +1981,11 @@ static int gpt_add_partition(
 		return -ENOSPC;
 	}
 
-	string_to_guid(pa && pa->type && pa->type->typestr ?
+	rc = string_to_guid(pa && pa->type && pa->type->typestr ?
 				pa->type->typestr:
 				GPT_DEFAULT_ENTRY_TYPE, &typeid);
+	if (rc)
+		return rc;
 
 	disk_f = find_first_available(pheader, ents, pheader->first_usable_lba);