xfs_io: don't assign cvtnum() return to unsigned var
PATCH 1/1 xfs_io: don't assign cvtnum() return to unsigned var
cvtnum() returns -1LL for unparseable values, but if we assign to a signed var, we can't test it:
xfs_io> mincore 0 xxx
range (0:0) is beyond mapping (0:1048576)
Use a temporary signed var so we can detect the error:
xfs_io> mincore 0 xxx
non-numeric length argument -- xxx
and also test whether it may overflow a size_t.
---
io/mincore.c +9 -4
@@ -30,7 +30,7 @@ mincore_f(int argc, char **argv) { - off64_t offset; + off64_t offset, llength;size_t length;size_t blocksize, sectsize;void *start;
@@ -49,12 +49,17 @@ mincore_f( argv[1]);return 0 ; } - length =cvtnum (blocksize, sectsize, argv[2 ]); -if (length <0 ) { + llength =cvtnum (blocksize, sectsize, argv[2 ]); +if (llength <0 ) {printf (_ ("non-numeric length argument -- %s\n" ), argv[2 ]);return 0 ; - } + }else if (llength > (size_t )llength) { +printf (_ ("length argument too large -- %lld\n" ), + llength); +return 0 ; + }else + length = (size_t )llength; }else {return command_usage (&mincore_cmd); }
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 1/1 xfs_io: don't assign cvtnum() return to unsigned var
(whoops meant to include 2 fixes in that)
cvtnum() returns -1LL for unparseable values, but if we assign to a signed var, we can't test it:
There are problems in mincore & madvise.
xfs_io> mincore 0 xxx
range (0:0) is beyond mapping (0:1048576)
Use a temporary signed var so we can detect the error:
xfs_io> mincore 0 xxx
non-numeric length argument -- xxx
and also test whether it may overflow a size_t.
---
io/mincore.c +9 -4
@@ -30,7 +30,7 @@ mincore_f(int argc, char **argv) { - off64_t offset; + off64_t offset, llength;size_t length;size_t blocksize, sectsize;void *start;
@@ -49,12 +49,17 @@ mincore_f( argv[1]);return 0 ; } - length =cvtnum (blocksize, sectsize, argv[2 ]); -if (length <0 ) { + llength =cvtnum (blocksize, sectsize, argv[2 ]); +if (llength <0 ) {printf (_ ("non-numeric length argument -- %s\n" ), argv[2 ]);return 0 ; - } + }else if (llength > (size_t )llength) { +printf (_ ("length argument too large -- %lld\n" ), + llength); +return 0 ; + }else + length = (size_t )llength; }else {return command_usage (&mincore_cmd); }
io/madvise.c +9 -4
@@ -52,7 +52,7 @@ madvise_f(int argc, char **argv) { - off64_t offset; + off64_t offset, llength;size_t length;void *start;int advise =MADV_NORMAL , c;
@@ -89,12 +89,17 @@ madvise_f(return 0 ; } optind++; - length =cvtnum (blocksize, sectsize, argv[optind]); -if (length <0 ) { + llength =cvtnum (blocksize, sectsize, argv[optind]); +if (llength <0 ) {printf (_ ("non-numeric length argument -- %s\n" ), argv[optind]);return 0 ; - } + }else if (llength > (size_t )llength) { +printf (_ ("length argument too large -- %lld\n" ), + llength); +return 0 ; + }else + length = (size_t )llength; }else {return command_usage (&madvise_cmd); }
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v3 1/1 xfs_io: don't assign cvtnum() return to unsigned var
(whoops meant to include 2 fixes in that)
(argh and fadvise too, I think this is the last one, sorry!)
cvtnum() returns -1LL for unparseable values, but if we assign to a signed var, we can't test it:
There are problems in fadvise, mincore & madvise.
xfs_io> mincore 0 xxx
range (0:0) is beyond mapping (0:1048576)
For mincore & madvise, se a temporary signed var so we can detect the error:
xfs_io> mincore 0 xxx
non-numeric length argument -- xxx
and also test whether it may overflow a size_t for mincore & madvise.
For fadvise, posix_fadvise64 wants an off_t anyway so just switch to that.
---
io/mincore.c +9 -4
@@ -30,7 +30,7 @@ mincore_f(int argc, char **argv) { - off64_t offset; + off64_t offset, llength;size_t length;size_t blocksize, sectsize;void *start;
@@ -49,12 +49,17 @@ mincore_f( argv[1]);return 0 ; } - length =cvtnum (blocksize, sectsize, argv[2 ]); -if (length <0 ) { + llength =cvtnum (blocksize, sectsize, argv[2 ]); +if (llength <0 ) {printf (_ ("non-numeric length argument -- %s\n" ), argv[2 ]);return 0 ; - } + }else if (llength > (size_t )llength) { +printf (_ ("length argument too large -- %lld\n" ), + llength); +return 0 ; + }else + length = (size_t )llength; }else {return command_usage (&mincore_cmd); }
io/madvise.c +9 -4
@@ -52,7 +52,7 @@ madvise_f(int argc, char **argv) { - off64_t offset; + off64_t offset, llength;size_t length;void *start;int advise =MADV_NORMAL , c;
@@ -89,12 +89,17 @@ madvise_f(return 0 ; } optind++; - length =cvtnum (blocksize, sectsize, argv[optind]); -if (length <0 ) { + llength =cvtnum (blocksize, sectsize, argv[optind]); +if (llength <0 ) {printf (_ ("non-numeric length argument -- %s\n" ), argv[optind]);return 0 ; - } + }else if (llength > (size_t )llength) { +printf (_ ("length argument too large -- %lld\n" ), + llength); +return 0 ; + }else + length = (size_t )llength; }else {return command_usage (&madvise_cmd); }
io/fadvise.c +1 -2
@@ -52,8 +52,7 @@ fadvise_f(int argc, char **argv) { - off64_t offset = 0; -size_t length =0 ; + off64_t offset = 0, length = 0;int c, range =0 , advise =POSIX_FADV_NORMAL ;while ((c =getopt (argc, argv,"dnrsw" )) !=EOF ) {
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 6 lines · Eric Sandeen
cvtnum()returns -1LL for unparseable values, but if we assign to a signed var, we can't test it:
xfs_io> mincore 0 xxx
range (0:0) is beyond mapping (0:1048576)
Quoted 6 lines
Use a temporary signed var so we can detect the error:
xfs_io> mincore 0 xxx
non-numeric length argument -- xxxand also test whether it may overflow a
size_t.
Looks good,
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 14 lines · Eric Sandeen
(whoops meant to include 2 fixes in that)
(argh and fadvise too, I think this is the last one, sorry!)
cvtnum()returns -1LL for unparseable values, but if we assign to a signed var, we can't test it:There are problems in fadvise, mincore & madvise.
xfs_io> mincore 0 xxx
range (0:0) is beyond mapping (0:1048576)For mincore & madvise, se a temporary signed var so we can detect the error:
Quoted 8 lines
xfs_io> mincore 0 xxx
non-numeric length argument -- xxxand also test whether it may overflow a
size_tfor mincore & madvise.For fadvise,
posix_fadvise64wants anoff_tanyway so just switch to that.
Looks good even with all three covered,
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs