Skip to content

Commit

Permalink
avoid casting pointer arguments to argconfig functions
Browse files Browse the repository at this point in the history 
Same issue as 456a24e ("Don't cast
pointers, cast values."), which was undone in
18de3a6 ("Convert to libnvme").

Add some functions to argconfig so that we can directly pass in
__u16/__u32/__u64 arrays without casting to int/long/etc, since an int
isn't always 32 bits, an unsigned long long isn't always 64 bits, etc.

Suggested-by: Randy Jennings <[email protected]>
  • Loading branch information
@jgu-pure
jgu-pure committed Aug 24, 2023
1 parent 6c59d12 commit 5926c95
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 17 deletions.
31 changes: 14 additions & 17 deletions nvme.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6725,9 +6725,9 @@ static int dsm(int argc, char **argv, struct command *cmd, struct plugin *plugin
if (err)
goto ret;

nc = argconfig_parse_comma_sep_array(cfg.ctx_attrs, (int *)ctx_attrs, ARRAY_SIZE(ctx_attrs));
nb = argconfig_parse_comma_sep_array(cfg.blocks, (int *)nlbs, ARRAY_SIZE(nlbs));
ns = argconfig_parse_comma_sep_array_long(cfg.slbas, (unsigned long long *)slbas, ARRAY_SIZE(slbas));
nc = argconfig_parse_comma_sep_array_u32(cfg.ctx_attrs, ctx_attrs, ARRAY_SIZE(ctx_attrs));
nb = argconfig_parse_comma_sep_array_u32(cfg.blocks, nlbs, ARRAY_SIZE(nlbs));
ns = argconfig_parse_comma_sep_array_u64(cfg.slbas, slbas, ARRAY_SIZE(slbas));
nr = max(nc, max(nb, ns));
if (!nr || nr > 256) {
nvme_show_error("No range definition provided");
Expand Down Expand Up @@ -6794,7 +6794,7 @@ static int copy_cmd(int argc, char **argv, struct command *cmd, struct plugin *p

uint16_t nr, nb, ns, nrts, natms, nats;
__u16 nlbs[128] = { 0 };
unsigned long long slbas[128] = {0,};
__u64 slbas[128] = { 0 };
struct nvme_dev *dev;
int err;

Expand Down Expand Up @@ -6876,24 +6876,23 @@ static int copy_cmd(int argc, char **argv, struct command *cmd, struct plugin *p
if (err)
goto ret;

nb = argconfig_parse_comma_sep_array_short(cfg.nlbs, nlbs, ARRAY_SIZE(nlbs));
ns = argconfig_parse_comma_sep_array_long(cfg.slbas, slbas, ARRAY_SIZE(slbas));
nb = argconfig_parse_comma_sep_array_u16(cfg.nlbs, nlbs, ARRAY_SIZE(nlbs));
ns = argconfig_parse_comma_sep_array_u64(cfg.slbas, slbas, ARRAY_SIZE(slbas));

if (cfg.format == 0) {
nrts = argconfig_parse_comma_sep_array(cfg.eilbrts, (int *)eilbrts.f0,
ARRAY_SIZE(eilbrts.f0));
nrts = argconfig_parse_comma_sep_array_u32(cfg.eilbrts, eilbrts.f0,
ARRAY_SIZE(eilbrts.f0));
} else if (cfg.format == 1) {
nrts = argconfig_parse_comma_sep_array_long(cfg.eilbrts,
(unsigned long long *)eilbrts.f1,
ARRAY_SIZE(eilbrts.f1));
nrts = argconfig_parse_comma_sep_array_u64(cfg.eilbrts, eilbrts.f1,
ARRAY_SIZE(eilbrts.f1));
} else {
nvme_show_error("invalid format");
err = -EINVAL;
goto close_dev;
}

natms = argconfig_parse_comma_sep_array(cfg.elbatms, (int *)elbatms, ARRAY_SIZE(elbatms));
nats = argconfig_parse_comma_sep_array(cfg.elbats, (int *)elbats, ARRAY_SIZE(elbats));
natms = argconfig_parse_comma_sep_array_u32(cfg.elbatms, elbatms, ARRAY_SIZE(elbatms));
nats = argconfig_parse_comma_sep_array_u32(cfg.elbats, elbats, ARRAY_SIZE(elbats));

nr = max(nb, max(ns, max(nrts, max(natms, nats))));
if (!nr || nr > 128 || (cfg.format == 1 && nr > 101)) {
Expand All @@ -6911,11 +6910,9 @@ static int copy_cmd(int argc, char **argv, struct command *cmd, struct plugin *p
}

if (cfg.format == 0)
nvme_init_copy_range(copy.f0, nlbs, (__u64 *)slbas,
eilbrts.f0, elbatms, elbats, nr);
nvme_init_copy_range(copy.f0, nlbs, slbas, eilbrts.f0, elbatms, elbats, nr);
else if (cfg.format == 1)
nvme_init_copy_range_f1(copy.f1, nlbs, (__u64 *)slbas,
eilbrts.f1, elbatms, elbats, nr);
nvme_init_copy_range_f1(copy.f1, nlbs, slbas, eilbrts.f1, elbatms, elbats, nr);

struct nvme_copy_args args = {
.args_size = sizeof(args),
Expand Down
52 changes: 52 additions & 0 deletions util/argconfig.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,58 @@ int argconfig_parse_comma_sep_array_long(char *string, unsigned long long *val,
}
}

#define DEFINE_ARGCONFIG_PARSE_COMMA_SEP_ARRAY_UINT_FUNC(size) \
int argconfig_parse_comma_sep_array_u##size(char *string, \
__u##size *val, \
unsigned int max_length) \
{ \
int ret = 0; \
uintmax_t v; \
char *tmp; \
char *p; \
\
if (!string || !strlen(string)) \
return 0; \
\
tmp = strtok(string, ","); \
if (!tmp) \
return 0; \
\
v = strtoumax(tmp, &p, 0); \
if (*p != 0) \
return -1; \
if (v > UINT##size##_MAX) { \
fprintf(stderr, "%s out of range\n", tmp); \
return -1; \
} \
val[ret] = v; \
\
ret++; \
while (1) { \
tmp = strtok(NULL, ","); \
\
if (tmp == NULL) \
return ret; \
\
if (ret >= max_length) \
return -1; \
\
v = strtoumax(tmp, &p, 0); \
if (*p != 0) \
return -1; \
if (v > UINT##size##_MAX) { \
fprintf(stderr, "%s out of range\n", tmp); \
return -1; \
} \
val[ret] = v; \
ret++; \
} \
}

DEFINE_ARGCONFIG_PARSE_COMMA_SEP_ARRAY_UINT_FUNC(16);
DEFINE_ARGCONFIG_PARSE_COMMA_SEP_ARRAY_UINT_FUNC(32);
DEFINE_ARGCONFIG_PARSE_COMMA_SEP_ARRAY_UINT_FUNC(64);

bool argconfig_parse_seen(struct argconfig_commandline_options *s,
const char *option)
{
Expand Down
8 changes: 8 additions & 0 deletions util/argconfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
#include <stdbool.h>
#include <stdint.h>

#include <linux/types.h>

enum argconfig_types {
CFG_FLAG,
CFG_STRING,
Expand Down Expand Up @@ -173,6 +175,12 @@ int argconfig_parse_comma_sep_array_short(char *string, unsigned short *ret,
unsigned int max_length);
int argconfig_parse_comma_sep_array_long(char *string, unsigned long long *ret,
unsigned int max_length);
int argconfig_parse_comma_sep_array_u16(char *string, __u16 *val,
unsigned int max_length);
int argconfig_parse_comma_sep_array_u32(char *string, __u32 *val,
unsigned int max_length);
int argconfig_parse_comma_sep_array_u64(char *string, __u64 *val,
unsigned int max_length);
int argconfig_parse_byte(const char *opt, const char *str, unsigned char *val);

void print_word_wrapped(const char *s, int indent, int start, FILE *stream);
Expand Down

0 comments on commit 5926c95

Please sign in to comment.