| Message ID | 20240417125937.917910-2-aalbersh@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Refactoring and error handling from Coverity scan fixes | expand |
On Wed, Apr 17, 2024 at 02:59:35PM +0200, Andrey Albershteyn wrote: > Replace atoi() which silently fails with strtol() and report the > error. > > Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com> > --- > fsr/xfs_fsr.c | 26 +++++++++++++++++++++++--- > 1 file changed, 23 insertions(+), 3 deletions(-) > > diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c > index 02d61ef9399a..cf764755288d 100644 > --- a/fsr/xfs_fsr.c > +++ b/fsr/xfs_fsr.c > @@ -164,7 +164,13 @@ main(int argc, char **argv) > usage(1); > break; > case 't': > - howlong = atoi(optarg); > + errno = 0; > + howlong = strtol(optarg, NULL, 10); > + if (errno) { > + fprintf(stderr, _("%s: invalid interval: %s\n"), "invalid runtime"? With that fixed, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > + optarg, strerror(errno)); > + exit(1); > + } > if (howlong > INT_MAX) { > fprintf(stderr, > _("%s: the maximum runtime is %d seconds.\n"), > @@ -179,10 +185,24 @@ main(int argc, char **argv) > mtab = optarg; > break; > case 'b': > - argv_blksz_dio = atoi(optarg); > + errno = 0; > + argv_blksz_dio = strtol(optarg, NULL, 10); > + if (errno) { > + fprintf(stderr, > + _("%s: invalid block size: %s\n"), > + optarg, strerror(errno)); > + exit(1); > + } > break; > case 'p': > - npasses = atoi(optarg); > + errno = 0; > + npasses = strtol(optarg, NULL, 10); > + if (errno) { > + fprintf(stderr, > + _("%s: invalid number of passes: %s\n"), > + optarg, strerror(errno)); > + exit(1); > + } > break; > case 'C': > /* Testing opt: coerses frag count in result */ > -- > 2.42.0 > >
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index 02d61ef9399a..cf764755288d 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -164,7 +164,13 @@ main(int argc, char **argv) usage(1); break; case 't': - howlong = atoi(optarg); + errno = 0; + howlong = strtol(optarg, NULL, 10); + if (errno) { + fprintf(stderr, _("%s: invalid interval: %s\n"), + optarg, strerror(errno)); + exit(1); + } if (howlong > INT_MAX) { fprintf(stderr, _("%s: the maximum runtime is %d seconds.\n"), @@ -179,10 +185,24 @@ main(int argc, char **argv) mtab = optarg; break; case 'b': - argv_blksz_dio = atoi(optarg); + errno = 0; + argv_blksz_dio = strtol(optarg, NULL, 10); + if (errno) { + fprintf(stderr, + _("%s: invalid block size: %s\n"), + optarg, strerror(errno)); + exit(1); + } break; case 'p': - npasses = atoi(optarg); + errno = 0; + npasses = strtol(optarg, NULL, 10); + if (errno) { + fprintf(stderr, + _("%s: invalid number of passes: %s\n"), + optarg, strerror(errno)); + exit(1); + } break; case 'C': /* Testing opt: coerses frag count in result */
Replace atoi() which silently fails with strtol() and report the error. Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com> --- fsr/xfs_fsr.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)