svn commit: r323790 - in vendor/illumos/dist: cmd/zpool lib/libzfs/common
Andriy Gapon
avg at FreeBSD.org
Wed Sep 20 07:18:10 UTC 2017
Author: avg
Date: Wed Sep 20 07:18:09 2017
New Revision: 323790
URL: https://svnweb.freebsd.org/changeset/base/323790
Log:
8567 Inconsistent return value in zpool_read_label
illumos/illumos-gate at c861bfbd77c4ae780a0341e9cb6926d8b74341cf
https://github.com/illumos/illumos-gate/commit/c861bfbd77c4ae780a0341e9cb6926d8b74341cf
https://www.illumos.org/issues/8567
If fstat64 fails, pread64 fails, or the label is unintelligible,
zpool_read_label will return 0. But if malloc fails, it will return -1. For
consistency, it should always return -1 on failure or 0 on success.
Reviewed by: Prakash Surya <prakash.surya at delphix.com>
Reviewed by: Matthew Ahrens <mahrens at delphix.com>
Approved by: Robert Mustacchi <rm at joyent.com>
Author: Alan Somers <asomers at gmail.com>
Modified:
vendor/illumos/dist/cmd/zpool/zpool_main.c
vendor/illumos/dist/lib/libzfs/common/libzfs_import.c
Modified: vendor/illumos/dist/cmd/zpool/zpool_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zpool/zpool_main.c Wed Sep 20 06:34:48 2017 (r323789)
+++ vendor/illumos/dist/cmd/zpool/zpool_main.c Wed Sep 20 07:18:09 2017 (r323790)
@@ -708,7 +708,7 @@ zpool_do_labelclear(int argc, char **argv)
return (1);
}
- if (zpool_read_label(fd, &config) != 0 || config == NULL) {
+ if (zpool_read_label(fd, &config) != 0) {
(void) fprintf(stderr,
gettext("failed to read label from %s\n"), vdev);
return (1);
Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_import.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_import.c Wed Sep 20 06:34:48 2017 (r323789)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_import.c Wed Sep 20 07:18:09 2017 (r323790)
@@ -841,6 +841,7 @@ label_offset(uint64_t size, int l)
/*
* Given a file descriptor, read the label information and return an nvlist
* describing the configuration, if there is one.
+ * Return 0 on success, or -1 on failure
*/
int
zpool_read_label(int fd, nvlist_t **config)
@@ -853,7 +854,7 @@ zpool_read_label(int fd, nvlist_t **config)
*config = NULL;
if (fstat64(fd, &statbuf) == -1)
- return (0);
+ return (-1);
size = P2ALIGN_TYPED(statbuf.st_size, sizeof (vdev_label_t), uint64_t);
if ((label = malloc(sizeof (vdev_label_t))) == NULL)
@@ -887,7 +888,7 @@ zpool_read_label(int fd, nvlist_t **config)
free(label);
*config = NULL;
- return (0);
+ return (-1);
}
typedef struct rdsk_node {
@@ -1052,7 +1053,7 @@ zpool_open_func(void *arg)
check_slices(rn->rn_avl, fd, rn->rn_name);
}
- if ((zpool_read_label(fd, &config)) != 0) {
+ if ((zpool_read_label(fd, &config)) != 0 && errno == ENOMEM) {
(void) close(fd);
(void) no_memory(rn->rn_hdl);
return;
@@ -1517,7 +1518,7 @@ zpool_in_use(libzfs_handle_t *hdl, int fd, pool_state_
*inuse = B_FALSE;
- if (zpool_read_label(fd, &config) != 0) {
+ if (zpool_read_label(fd, &config) != 0 && errno == ENOMEM) {
(void) no_memory(hdl);
return (-1);
}
More information about the svn-src-all
mailing list