diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-01-26 10:29:14 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-01-26 10:29:16 -0500 |
| commit | a930493fb800d3a82f5482ec0915801c26205ef3 (patch) | |
| tree | ce44f90e24c1689f6e003f22bbc10377bbb7a6e4 /usr/src/uts/common/io | |
| parent | ca7e98efc99f1be718cca849bd004b6d5ca2ce58 (diff) | |
| parent | 90fd277545647a48fe36a73f89288db6ce148c54 (diff) | |
| download | illumos-joyent-a930493fb800d3a82f5482ec0915801c26205ef3.tar.gz | |
[illumos-gate merge]
commit 90fd277545647a48fe36a73f89288db6ce148c54
13427 ppm: overflow in conversion
commit dca2b4edbfdf8b595d031a5a2e7eaf98738f5055
5750 ddi_ffs(9f)/ddi_fls(9f) are 64-bit aware
Conflicts:
usr/src/man/man9f/ddi_ffs.9f
Diffstat (limited to 'usr/src/uts/common/io')
| -rw-r--r-- | usr/src/uts/common/io/ppm/ppm_subr.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/src/uts/common/io/ppm/ppm_subr.c b/usr/src/uts/common/io/ppm/ppm_subr.c index d0e3c5788c..af19c622ce 100644 --- a/usr/src/uts/common/io/ppm/ppm_subr.c +++ b/usr/src/uts/common/io/ppm/ppm_subr.c @@ -831,7 +831,7 @@ ppm_init_cb(dev_info_t *dip) int ppm_init_lyr(ppm_dc_t *dc, dev_info_t *dip) { - char *str = "ppm_init_lyr"; + char *str = "ppm_init_lyr"; int err = 0; ldi_ident_t li; @@ -994,8 +994,10 @@ ppm_stoi(char *ss, uint_t *val) int hex_ = 0, base = D_BASE; int digit; - if ((cp = strchr(ss, '=')) == NULL) - return (*val = (uint_t)-1); + if ((cp = strchr(ss, '=')) == NULL) { + *val = UINT_MAX; + return (-1); + } cp++; if ((*cp == '0') && (*++cp == 'x')) { @@ -1064,10 +1066,11 @@ ppm_convert(char *symbol, uint_t *val) char *s; struct ppm_confdefs *pcfp; + *val = UINT_MAX; if ((s = strchr(symbol, '=')) == NULL) { cmn_err(CE_WARN, "ppm_convert: token \"%s\" syntax error in " "ppm.conf file", symbol); - return (*val = (uint_t)-1); + return (-1); } s++; @@ -1078,7 +1081,7 @@ ppm_convert(char *symbol, uint_t *val) cmn_err(CE_WARN, "ppm_convert: Unrecognizable token \"%s\" " "in ppm.conf file", symbol); - return (*val = (uint_t)-1); + return (-1); } |