|
 |
b15ea1 |
From 22bc0866e941cbfe57de6522db51e9cf2c6b3ff1 Mon Sep 17 00:00:00 2001
|
|
|
b15ea1 |
From: Peter Jones <pjones@redhat.com>
|
|
|
b15ea1 |
Date: Wed, 2 Oct 2019 17:01:00 -0400
|
|
|
b15ea1 |
Subject: [PATCH 54/86] Fix the error path in set_disk_and_part_name()
|
|
|
b15ea1 |
|
|
|
b15ea1 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
b15ea1 |
---
|
|
|
b15ea1 |
src/linux.c | 12 ++++++++++--
|
|
|
b15ea1 |
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
b15ea1 |
|
|
|
b15ea1 |
diff --git a/src/linux.c b/src/linux.c
|
|
|
b15ea1 |
index 45b1ee2d96f..1f37933f546 100644
|
|
|
b15ea1 |
--- a/src/linux.c
|
|
|
b15ea1 |
+++ b/src/linux.c
|
|
|
b15ea1 |
@@ -1,6 +1,6 @@
|
|
|
b15ea1 |
/*
|
|
|
b15ea1 |
* libefiboot - library for the manipulation of EFI boot variables
|
|
|
b15ea1 |
- * Copyright 2012-2015 Red Hat, Inc.
|
|
|
b15ea1 |
+ * Copyright 2012-2019 Red Hat, Inc.
|
|
|
b15ea1 |
* Copyright (C) 2001 Dell Computer Corporation <Matt_Domsch@dell.com>
|
|
|
b15ea1 |
*
|
|
|
b15ea1 |
* This library is free software; you can redistribute it and/or
|
|
|
b15ea1 |
@@ -169,6 +169,8 @@ set_disk_name(struct device *dev, const char * const fmt, ...)
|
|
|
b15ea1 |
int HIDDEN
|
|
|
b15ea1 |
set_disk_and_part_name(struct device *dev)
|
|
|
b15ea1 |
{
|
|
|
b15ea1 |
+ int rc = -1;
|
|
|
b15ea1 |
+
|
|
|
b15ea1 |
/*
|
|
|
b15ea1 |
* results are like such:
|
|
|
b15ea1 |
* maj:min -> ../../devices/pci$PCI_STUFF/$BLOCKDEV_STUFF/block/$DISK/$PART
|
|
|
b15ea1 |
@@ -200,6 +202,7 @@ set_disk_and_part_name(struct device *dev)
|
|
|
b15ea1 |
set_disk_name(dev, "%s", penultimate);
|
|
|
b15ea1 |
set_part_name(dev, "%s", ultimate);
|
|
|
b15ea1 |
debug("disk:%s part:%s", penultimate, ultimate);
|
|
|
b15ea1 |
+ rc = 0;
|
|
|
b15ea1 |
} else if (ultimate && approximate && !strcmp(approximate, "nvme")) {
|
|
|
b15ea1 |
/*
|
|
|
b15ea1 |
* 259:0 -> ../../devices/pci0000:00/0000:00:1d.0/0000:05:00.0/nvme/nvme0/nvme0n1
|
|
|
b15ea1 |
@@ -207,6 +210,7 @@ set_disk_and_part_name(struct device *dev)
|
|
|
b15ea1 |
set_disk_name(dev, "%s", ultimate);
|
|
|
b15ea1 |
set_part_name(dev, "%sp%d", ultimate, dev->part);
|
|
|
b15ea1 |
debug("disk:%s part:%sp%d", ultimate, ultimate, dev->part);
|
|
|
b15ea1 |
+ rc = 0;
|
|
|
b15ea1 |
} else if (ultimate && penultimate && !strcmp(penultimate, "block")) {
|
|
|
b15ea1 |
/*
|
|
|
b15ea1 |
* 253:0 -> ../../devices/virtual/block/dm-0 (... I guess)
|
|
|
b15ea1 |
@@ -220,15 +224,19 @@ set_disk_and_part_name(struct device *dev)
|
|
|
b15ea1 |
set_disk_name(dev, "%s", ultimate);
|
|
|
b15ea1 |
set_part_name(dev, "%s%d", ultimate, dev->part);
|
|
|
b15ea1 |
debug("disk:%s part:%s%d", ultimate, ultimate, dev->part);
|
|
|
b15ea1 |
+ rc = 0;
|
|
|
b15ea1 |
} else if (ultimate && approximate && !strcmp(approximate, "mtd")) {
|
|
|
b15ea1 |
/*
|
|
|
b15ea1 |
* 31:0 -> ../../devices/platform/1e000000.palmbus/1e000b00.spi/spi_master/spi32766/spi32766.0/mtd/mtd0/mtdblock0
|
|
|
b15ea1 |
*/
|
|
|
b15ea1 |
set_disk_name(dev, "%s", ultimate);
|
|
|
b15ea1 |
debug("disk:%s", ultimate);
|
|
|
b15ea1 |
+ rc = 0;
|
|
|
b15ea1 |
}
|
|
|
b15ea1 |
|
|
|
b15ea1 |
- return 0;
|
|
|
b15ea1 |
+ if (rc < 0)
|
|
|
b15ea1 |
+ efi_error("Could not parse disk name:\"%s\"", dev->link);
|
|
|
b15ea1 |
+ return rc;
|
|
|
b15ea1 |
}
|
|
|
b15ea1 |
|
|
|
b15ea1 |
static struct dev_probe *dev_probes[] = {
|
|
|
b15ea1 |
--
|
|
|
b15ea1 |
2.24.1
|
|
|
b15ea1 |
|