From: Lucas De Marchi <lucas.demarchi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>,
Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Subject: [CI 3/6] lib/igt_drm_fdinfo: Detect invalid drm-client-id
Date: Tue, 30 Apr 2024 12:01:47 -0700 [thread overview]
Message-ID: <20240430190150.3654507-3-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240430190150.3654507-1-lucas.demarchi@intel.com>
Use strtol() for string to long conversion which allows us to detect if
there was an invalid number. It also has the advantage that it already
ignores leading spaces.
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
lib/igt_drm_fdinfo.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/igt_drm_fdinfo.c b/lib/igt_drm_fdinfo.c
index bc3082d42..b700ec317 100644
--- a/lib/igt_drm_fdinfo.c
+++ b/lib/igt_drm_fdinfo.c
@@ -224,6 +224,7 @@ __igt_parse_drm_fdinfo(int dir, const char *fd, struct drm_client_fdinfo *info,
while ((l = strtok_r(_buf, "\n", &ctx))) {
uint64_t val = 0;
const char *v;
+ char *end_ptr;
int idx;
_buf = NULL;
@@ -233,8 +234,9 @@ __igt_parse_drm_fdinfo(int dir, const char *fd, struct drm_client_fdinfo *info,
good++;
} else if ((v = find_kv(l, "drm-client-id",
strlen("drm-client-id")))) {
- info->id = atol(v);
- good++;
+ info->id = strtol(v, &end_ptr, 10);
+ if (end_ptr != v)
+ good++;
} else if ((v = find_kv(l, "drm-pdev", strlen("drm-pdev")))) {
/* optional */
assert(strlen(v) < sizeof(info->pdev));
--
2.43.0
next prev parent reply other threads:[~2024-04-30 19:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 19:01 [CI 1/6] lib/igt_drm_fdinfo: Fix wrong name len assert Lucas De Marchi
2024-04-30 19:01 ` [CI 2/6] lib/igt_drm_fdinfo: Assert pdev is not truncated Lucas De Marchi
2024-04-30 19:01 ` Lucas De Marchi [this message]
2024-04-30 19:01 ` [CI 4/6] lib/igt_drm_fdinfo: Stop ignoring space where not needed Lucas De Marchi
2024-04-30 19:01 ` [CI 5/6] tools/gputop: Extract method to update console size Lucas De Marchi
2024-04-30 19:01 ` [CI 6/6] tools/gputop: Extract clrscr() Lucas De Marchi
2024-04-30 21:11 ` ✓ Fi.CI.BAT: success for series starting with [CI,1/6] lib/igt_drm_fdinfo: Fix wrong name len assert Patchwork
2024-04-30 21:19 ` ✓ CI.xeBAT: " Patchwork
2024-05-01 2:24 ` ✗ CI.xeFULL: failure " Patchwork
2024-05-01 6:42 ` ✗ Fi.CI.IGT: " Patchwork
2024-05-01 13:59 ` [CI 1/6] " Lucas De Marchi
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=20240430190150.3654507-3-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=umesh.nerlige.ramappa@intel.com \
/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