d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r323790: 8567 Inconsistent return value in zpool_read_label

Browse Source 
illumos/illumos-gate@c861bfbd77
c861bfbd77

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@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Author: Alan Somers <asomers@gmail.com>

MFC after:	2 weeks
This commit is contained in:
Andriy Gapon 2017-09-20 07:23:50 +00:00
commit 65b5f7c743
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=323791
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
View File

@ -705,7 +705,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);

9
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
View File

@ -865,6 +865,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)
@ -877,7 +878,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)
@ -911,7 +912,7 @@ zpool_read_label(int fd, nvlist_t **config)
free(label);
*config = NULL;
return (0);
return (-1);
}
/*
@ -1148,7 +1149,7 @@ zpool_open_func(void *arg)
}
#endif /* illumos */
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;
@ -1649,7 +1650,7 @@ zpool_in_use(libzfs_handle_t *hdl, int fd, pool_state_t *state, char **namestr,
*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);
}