c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-18 02:20:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use signed types to prevent subtraction overflow

Browse Source 
The difference between the sizes could be positive or negative. Leaving
the types as unsigned means the result overflows when the difference is
negative and removing the labs() means we'll have introduced a bug. The
subtraction results in the correct value when the unsigned integer is
interpreted as a signed integer by labs().

Clang doesn't see that we're doing a subtraction and abusing the types.
It sees the result of the subtraction, an unsigned value, being passed
to an absolute value function and emits a warning which we treat as an
error.

Reviewed by: Youzhong Yang <youzhong@gmail.com>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes #9355
This commit is contained in:
Ryan Moeller 2019-09-22 18:27:53 -04:00 committed by Tony Hutter
parent 3ec97ba6f1
commit 8498a2f3f8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/zpool/zpool_vdev.c
View File

@ -829,7 +829,7 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
rep.zprl_children = 1; rep.zprl_children = 1;
rep.zprl_parity = 0; rep.zprl_parity = 0;
} else { } else {
uint64_t vdev_size; int64_t vdev_size;
/* /*
* This is a mirror or RAID-Z vdev. Go through and make * This is a mirror or RAID-Z vdev. Go through and make
@ -859,12 +859,12 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
*/ */
type = NULL; type = NULL;
dontreport = 0; dontreport = 0;
vdev_size = -1ULL; vdev_size = -1LL;
for (c = 0; c < children; c++) { for (c = 0; c < children; c++) {
nvlist_t *cnv = child[c]; nvlist_t *cnv = child[c];
char *path; char *path;
struct stat64 statbuf; struct stat64 statbuf;
uint64_t size = -1ULL; int64_t size = -1LL;
char *childtype; char *childtype;
int fd, err; int fd, err;
@ -955,7 +955,7 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
* (~16MB) then report an error. * (~16MB) then report an error.
*/ */
if (!dontreport && if (!dontreport &&
(vdev_size != -1ULL && (vdev_size != -1LL &&
(labs(size - vdev_size) > (labs(size - vdev_size) >
ZPOOL_FUZZ))) { ZPOOL_FUZZ))) {
if (ret != NULL) if (ret != NULL)