From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:59671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1giNaS-0003aA-Cz for qemu-devel@nongnu.org; Sat, 12 Jan 2019 13:00:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1giNYL-0001r1-TJ for qemu-devel@nongnu.org; Sat, 12 Jan 2019 12:58:40 -0500 From: Eric Blake Date: Sat, 12 Jan 2019 11:57:59 -0600 Message-Id: <20190112175812.27068-7-eblake@redhat.com> In-Reply-To: <20190112175812.27068-1-eblake@redhat.com> References: <20190112175812.27068-1-eblake@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 06/19] qemu-nbd: Avoid strtol open-coding List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: nsoffer@redhat.com, rjones@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, qemu-block@nongnu.org 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 Message-Id: <20181215135324.152629-8-eblake@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 =3D 0; - char *end; int flags =3D BDRV_O_RDWR; - int partition =3D -1; + int partition =3D 0; int ret =3D 0; bool seen_cache =3D false; bool seen_discard =3D false; @@ -660,9 +659,8 @@ int main(int argc, char **argv) port =3D optarg; break; case 'o': - dev_offset =3D 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 &=3D ~BDRV_O_RDWR; break; case 'P': - partition =3D 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 =3D optarg; break; case 'e': - shared =3D 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 =3D optarg; @@ -1007,7 +997,7 @@ int main(int argc, char **argv) } fd_size -=3D dev_offset; - if (partition !=3D -1) { + if (partition) { int64_t limit; if (dev_offset) { --=20 2.20.1