From: Thomas Huth <thuth@redhat.com>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
Cornelia Huck <cohuck@redhat.com>,
qemu-s390x@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 5/6] pc-bios/s390-ccw: Clean up harmless misuse of isdigit()
Date: Thu, 18 Apr 2019 18:28:05 +0200 [thread overview]
Message-ID: <4aa820cd-bb5e-b891-bd77-42afab8de347@redhat.com> (raw)
In-Reply-To: <20190418145355.21100-6-armbru@redhat.com>
On 18/04/2019 16.53, Markus Armbruster wrote:
> atoui() and get_index() pass char values to isdigit(). With a
> standard isdigit(), we'd get undefined behavior when the value is
> negative. But we're using isdigit() from pc-bios/s390-ccw/libc.h
> here, which behaves nicely. Clean up anyway, just to avoid setting a
> bad example.
>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> pc-bios/s390-ccw/libc.c | 2 +-
> pc-bios/s390-ccw/menu.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/libc.c b/pc-bios/s390-ccw/libc.c
> index a786566c4c..3187923950 100644
> --- a/pc-bios/s390-ccw/libc.c
> +++ b/pc-bios/s390-ccw/libc.c
> @@ -38,7 +38,7 @@ uint64_t atoui(const char *str)
> }
>
> while (*str) {
> - if (!isdigit(*str)) {
> + if (!isdigit(*(unsigned char *)str)) {
> break;
> }
> val = val * 10 + *str - '0';
> diff --git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c
> index 82a4ae6315..ce3815b201 100644
> --- a/pc-bios/s390-ccw/menu.c
> +++ b/pc-bios/s390-ccw/menu.c
> @@ -134,7 +134,7 @@ static int get_index(void)
>
> /* Check for erroneous input */
> for (i = 0; i < len; i++) {
> - if (!isdigit(buf[i])) {
> + if (!isdigit((unsigned char)buf[i])) {
> return -1;
> }
> }
FWIW, "char" is unsigned by default on s390x, so this is doing nothing.
Thomas
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Huth <thuth@redhat.com>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, Cornelia Huck <cohuck@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 5/6] pc-bios/s390-ccw: Clean up harmless misuse of isdigit()
Date: Thu, 18 Apr 2019 18:28:05 +0200 [thread overview]
Message-ID: <4aa820cd-bb5e-b891-bd77-42afab8de347@redhat.com> (raw)
Message-ID: <20190418162805.tPJn0kYssgM5_YAK_FmBzrWDo-7wSHDYU4lZMuMxepw@z> (raw)
In-Reply-To: <20190418145355.21100-6-armbru@redhat.com>
On 18/04/2019 16.53, Markus Armbruster wrote:
> atoui() and get_index() pass char values to isdigit(). With a
> standard isdigit(), we'd get undefined behavior when the value is
> negative. But we're using isdigit() from pc-bios/s390-ccw/libc.h
> here, which behaves nicely. Clean up anyway, just to avoid setting a
> bad example.
>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> pc-bios/s390-ccw/libc.c | 2 +-
> pc-bios/s390-ccw/menu.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/libc.c b/pc-bios/s390-ccw/libc.c
> index a786566c4c..3187923950 100644
> --- a/pc-bios/s390-ccw/libc.c
> +++ b/pc-bios/s390-ccw/libc.c
> @@ -38,7 +38,7 @@ uint64_t atoui(const char *str)
> }
>
> while (*str) {
> - if (!isdigit(*str)) {
> + if (!isdigit(*(unsigned char *)str)) {
> break;
> }
> val = val * 10 + *str - '0';
> diff --git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c
> index 82a4ae6315..ce3815b201 100644
> --- a/pc-bios/s390-ccw/menu.c
> +++ b/pc-bios/s390-ccw/menu.c
> @@ -134,7 +134,7 @@ static int get_index(void)
>
> /* Check for erroneous input */
> for (i = 0; i < len; i++) {
> - if (!isdigit(buf[i])) {
> + if (!isdigit((unsigned char)buf[i])) {
> return -1;
> }
> }
FWIW, "char" is unsigned by default on s390x, so this is doing nothing.
Thomas
next prev parent reply other threads:[~2019-04-18 16:28 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-18 14:53 [Qemu-devel] [PATCH 0/6] Fix misuse of ctype.h functions Markus Armbruster
2019-04-18 14:53 ` Markus Armbruster
2019-04-18 14:53 ` [Qemu-devel] [PATCH 1/6] qemu-bridge-helper: Fix misuse of isspace() Markus Armbruster
2019-04-18 14:53 ` Markus Armbruster
2019-04-18 15:19 ` Philippe Mathieu-Daudé
2019-04-18 15:19 ` Philippe Mathieu-Daudé
2019-05-13 13:13 ` Markus Armbruster
2019-05-13 13:58 ` Peter Maydell
2019-05-14 12:18 ` Markus Armbruster
2019-05-14 16:03 ` Philippe Mathieu-Daudé
2019-05-15 4:04 ` Jason Wang
2019-05-15 6:34 ` Markus Armbruster
2019-05-15 10:09 ` Peter Maydell
2019-05-15 10:26 ` Daniel P. Berrangé
2019-05-15 14:54 ` Markus Armbruster
2019-05-15 14:55 ` Daniel P. Berrangé
2019-05-15 15:38 ` Richard Henderson
2019-05-15 16:55 ` Markus Armbruster
2019-05-15 17:28 ` Richard Henderson
2019-05-15 13:35 ` Paolo Bonzini
2019-05-17 4:35 ` Jason Wang
2019-05-17 11:45 ` Paolo Bonzini
2019-04-18 14:53 ` [Qemu-devel] [PATCH 2/6] tests/vhost-user-bridge: Fix misuse of isdigit() Markus Armbruster
2019-04-18 14:53 ` Markus Armbruster
2019-04-18 14:53 ` [Qemu-devel] [PATCH 3/6] gdbstub: Reject invalid RLE repeat counts Markus Armbruster
2019-04-18 14:53 ` Markus Armbruster
2019-04-18 15:26 ` Philippe Mathieu-Daudé
2019-04-18 15:26 ` Philippe Mathieu-Daudé
2019-05-13 12:39 ` Markus Armbruster
2019-05-13 13:05 ` Philippe Mathieu-Daudé
2019-04-18 14:53 ` [Qemu-devel] [PATCH 4/6] gdbstub: Fix misuse of isxdigit() Markus Armbruster
2019-04-18 14:53 ` Markus Armbruster
2019-04-18 14:53 ` [Qemu-devel] [PATCH 5/6] pc-bios/s390-ccw: Clean up harmless misuse of isdigit() Markus Armbruster
2019-04-18 14:53 ` Markus Armbruster
2019-04-18 16:28 ` Thomas Huth [this message]
2019-04-18 16:28 ` Thomas Huth
2019-04-18 18:13 ` Markus Armbruster
2019-04-18 18:13 ` Markus Armbruster
2019-05-08 8:51 ` Thomas Huth
2019-04-18 14:53 ` [Qemu-devel] [PATCH 6/6] cutils: Simplify how parse_uint() checks for whitespace Markus Armbruster
2019-04-18 14:53 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4aa820cd-bb5e-b891-bd77-42afab8de347@redhat.com \
--to=thuth@redhat.com \
--cc=armbru@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).