c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

btree_test: smatch did detect few issues

Browse Source 
Add missing header.
Properly ignore return values.

Memory leak/unchecked malloc. We do allocate a bit too early (and
fail to validate the result). From this, smatch is angry when we
overwrite the value of 'node' later.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Signed-off-by: Toomas Soome <tsoome@me.com>
Closes #13941
This commit is contained in:
Toomas Soome 2022-09-28 03:09:21 +03:00 committed by GitHub
parent e872ea16f2
commit af65073a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/zfs-tests/cmd/btree_test.c
View File

@ -15,6 +15,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/avl.h> #include <sys/avl.h>
#include <sys/btree.h> #include <sys/btree.h>
#include <sys/time.h> #include <sys/time.h>
@ -164,7 +165,7 @@ find_without_index(zfs_btree_t *bt, char *why)
zfs_btree_add(bt, &i); zfs_btree_add(bt, &i);
if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, NULL)) == NULL || if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, NULL)) == NULL ||
*p != i) { *p != i) {
snprintf(why, BUFSIZE, "Unexpectedly found %llu\n", (void) snprintf(why, BUFSIZE, "Unexpectedly found %llu\n",
p == NULL ? 0 : *p); p == NULL ? 0 : *p);
return (1); return (1);
} }
@ -172,7 +173,7 @@ find_without_index(zfs_btree_t *bt, char *why)
i++; i++;
if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, NULL)) != NULL) { if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, NULL)) != NULL) {
snprintf(why, BUFSIZE, "Found bad value: %llu\n", *p); (void) snprintf(why, BUFSIZE, "Found bad value: %llu\n", *p);
return (1); return (1);
} }
@ -189,10 +190,10 @@ insert_find_remove(zfs_btree_t *bt, char *why)
/* Insert 'i' into the tree, and attempt to find it again. */ /* Insert 'i' into the tree, and attempt to find it again. */
zfs_btree_add(bt, &i); zfs_btree_add(bt, &i);
if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, &bt_idx)) == NULL) { if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, &bt_idx)) == NULL) {
snprintf(why, BUFSIZE, "Didn't find value in tree\n"); (void) snprintf(why, BUFSIZE, "Didn't find value in tree\n");
return (1); return (1);
} else if (*p != i) { } else if (*p != i) {
snprintf(why, BUFSIZE, "Found (%llu) in tree\n", *p); (void) snprintf(why, BUFSIZE, "Found (%llu) in tree\n", *p);
return (1); return (1);
} }
ASSERT3S(zfs_btree_numnodes(bt), ==, 1); ASSERT3S(zfs_btree_numnodes(bt), ==, 1);
@ -201,7 +202,8 @@ insert_find_remove(zfs_btree_t *bt, char *why)
/* Remove 'i' from the tree, and verify it is not found. */ /* Remove 'i' from the tree, and verify it is not found. */
zfs_btree_remove(bt, &i); zfs_btree_remove(bt, &i);
if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, &bt_idx)) != NULL) { if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, &bt_idx)) != NULL) {
snprintf(why, BUFSIZE, "Found removed value (%llu)\n", *p); (void) snprintf(why, BUFSIZE,
"Found removed value (%llu)\n", *p);
return (1); return (1);
} }
ASSERT3S(zfs_btree_numnodes(bt), ==, 0); ASSERT3S(zfs_btree_numnodes(bt), ==, 0);
@ -240,9 +242,12 @@ drain_tree(zfs_btree_t *bt, char *why)
zfs_btree_add_idx(bt, &randval, &bt_idx); zfs_btree_add_idx(bt, &randval, &bt_idx);
node = malloc(sizeof (int_node_t)); node = malloc(sizeof (int_node_t));
ASSERT3P(node, !=, NULL);
node->data = randval; node->data = randval;
if ((ret = avl_find(&avl, node, &avl_idx)) != NULL) { if ((ret = avl_find(&avl, node, &avl_idx)) != NULL) {
snprintf(why, BUFSIZE, "Found in avl: %llu\n", randval); (void) snprintf(why, BUFSIZE,
"Found in avl: %llu\n", randval);
return (1); return (1);
} }
avl_insert(&avl, node, avl_idx); avl_insert(&avl, node, avl_idx);
@ -422,7 +427,8 @@ do_negative_test(zfs_btree_t *bt, char *test_name)
{ {
int rval = 0; int rval = 0;
struct rlimit rlim = {0}; struct rlimit rlim = {0};
setrlimit(RLIMIT_CORE, &rlim);
(void) setrlimit(RLIMIT_CORE, &rlim);
if (strcmp(test_name, "insert_duplicate") == 0) { if (strcmp(test_name, "insert_duplicate") == 0) {
rval = insert_duplicate(bt); rval = insert_duplicate(bt);