12.01.2019 20:57, Eric Blake wrote:
> Our copy-and-pasted open-coding of strtol handling forgot to
> handle overflow conditions. Use qemu_strto*() instead.
>
> In the case of --partition, since we insist on a user-supplied
> partition to be non-zero, we can use 0 rather than -1 for our
> initial value to distinguish when a partition is not being
> served, for slightly more optimal code.
>
> The error messages for out-of-bounds values are less specific,
> but should not be a terrible loss in quality.
>
> Signed-off-by: Eric Blake <ebl...@redhat.com>
> Message-Id: <20181215135324.152629-8-ebl...@redhat.com>
>
> ---
> v3: rebase to use int64_t rather than off_t [Vladimir]
> ---
> qemu-nbd.c | 28 +++++++++-------------------
> 1 file changed, 9 insertions(+), 19 deletions(-)
>
> diff --git a/qemu-nbd.c b/qemu-nbd.c
> index 96c0829970c..4670b659167 100644
> --- a/qemu-nbd.c
> +++ b/qemu-nbd.c
> @@ -546,9 +546,8 @@ int main(int argc, char **argv)
> };
> int ch;
> int opt_ind = 0;
> - char *end;
> int flags = BDRV_O_RDWR;
> - int partition = -1;
> + int partition = 0;
> int ret = 0;
> bool seen_cache = false;
> bool seen_discard = false;
> @@ -660,9 +659,8 @@ int main(int argc, char **argv)
> port = optarg;
> break;
> case 'o':
> - dev_offset = strtoll (optarg, &end, 0);
> - if (*end) {
> - error_report("Invalid offset `%s'", optarg);
> + if (qemu_strtou64(optarg, NULL, 0, &dev_offset) < 0) {
> + error_report("Invalid offset '%s'", optarg);
> exit(EXIT_FAILURE);
> }
> break;
> @@ -684,13 +682,9 @@ int main(int argc, char **argv)
> flags &= ~BDRV_O_RDWR;
> break;
> case 'P':
> - partition = strtol(optarg, &end, 0);
> - if (*end) {
> - error_report("Invalid partition `%s'", optarg);
> - exit(EXIT_FAILURE);
> - }
> - if (partition < 1 || partition > 8) {
> - error_report("Invalid partition %d", partition);
> + if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 ||
we can use unsigned conversion like for offset (and unsigned type for
partition), but this doesn't really matter.
> + partition < 1 || partition > 8) {
> + error_report("Invalid partition '%s'", optarg);
> exit(EXIT_FAILURE);
> }
> break;
> @@ -711,15 +705,11 @@ int main(int argc, char **argv)
> device = optarg;
> break;
> case 'e':
> - shared = strtol(optarg, &end, 0);
> - if (*end) {
> + if (qemu_strtoi(optarg, NULL, 0, &shared) < 0 ||
and here
> + shared < 1) {
> error_report("Invalid shared device number '%s'", optarg);
> exit(EXIT_FAILURE);
> }
> - if (shared < 1) {
> - error_report("Shared device number must be greater than 0");
> - exit(EXIT_FAILURE);
> - }
> break;
> case 'f':
> fmt = optarg;
> @@ -1007,7 +997,7 @@ int main(int argc, char **argv)
> }
> fd_size -= dev_offset;
>
> - if (partition != -1) {
> + if (partition) {
> int64_t limit;
>
> if (dev_offset) {
>
anyway,
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
--
Best regards,
Vladimir
