From 0a0c3e3e1453856848ff9ee25ecc98045f89e194 Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

Date: Wed, 27 Mar 2019 17:22:41 +0100

Subject: [PATCH 103/163] qemu-nbd: Avoid strtol open-coding

RH-Author: John Snow <jsnow@redhat.com>

Message-id: <20190327172308.31077-29-jsnow@redhat.com>

Patchwork-id: 85191

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 28/55] qemu-nbd: Avoid strtol open-coding

Bugzilla: 1691009

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Eric Blake <eblake@redhat.com>

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 <eblake@redhat.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Reviewed-by: Richard W.M. Jones <rjones@redhat.com>

Message-Id: <20190117193658.16413-8-eblake@redhat.com>

(cherry picked from commit 43b510113bb2c6393c98a31dae9b57022a9c5636)

Signed-off-by: John Snow <jsnow@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 qemu-nbd.c | 28 +++++++++-------------------

 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/qemu-nbd.c b/qemu-nbd.c

index 598caa6..efca0e4 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 ||

+                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 ||

+                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) {

         uint64_t limit;

         if (dev_offset) {

-- 

1.8.3.1