From: Lucas De Marchi <lucas.demarchi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>,
Tvrtko Ursulin <tursulin@ursulin.net>,
Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [PATCH i-g-t v2 03/21] lib/igt_drm_fdinfo: Detect invalid drm-client-id
Date: Tue, 23 Apr 2024 16:44:13 -0700 [thread overview]
Message-ID: <20240423234431.1959354-4-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240423234431.1959354-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-23 23:44 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 23:44 [PATCH i-g-t v2 00/21] gputop: Add support for xe Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 01/21] lib/igt_drm_fdinfo: Fix wrong name len assert Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 02/21] lib/igt_drm_fdinfo: Assert pdev is not truncated Lucas De Marchi
2024-04-23 23:44 ` Lucas De Marchi [this message]
2024-04-23 23:44 ` [PATCH i-g-t v2 04/21] lib/igt_drm_fdinfo: Stop ignoring space where not needed Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 05/21] gputop: Extract method to update console size Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 06/21] gputop: Extract clrscr() Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 07/21] lib/igt_drm_fdinfo: Extract ignore_space() Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 08/21] lib/igt_drm_fdinfo: Allow any number of spaces before unit Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 09/21] lib/igt_drm_fdinfo: Stop passing key twice Lucas De Marchi
2024-04-25 21:27 ` Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 10/21] lib/igt_drm_fdinfo: Remove prefix arg from parse functions Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 11/21] lib/igt_drm_fdinfo: Parse drm-cycles Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 12/21] lib/igt_drm_fdinfo: Parse drm-total-cycles Lucas De Marchi
2024-04-26 11:03 ` Tvrtko Ursulin
2024-04-23 23:44 ` [PATCH i-g-t v2 13/21] lib/igt_drm_clients: Rename engine busyness variables Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 14/21] lib/igt_drm_clients: Move engine fields to substruct Lucas De Marchi
2024-04-26 11:05 ` Tvrtko Ursulin
2024-04-23 23:44 ` [PATCH i-g-t v2 15/21] lib/igt_drm_clients: Record total cycles Lucas De Marchi
2024-04-26 11:11 ` Tvrtko Ursulin
2024-04-26 13:28 ` Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 16/21] gputop: Add support to drm-cycles/drm-total-cycles Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 17/21] gputop: print percentage number Lucas De Marchi
2024-04-26 11:16 ` Tvrtko Ursulin
2024-04-23 23:44 ` [PATCH i-g-t v2 18/21] gputop: Add option parsing Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 19/21] gputop: Allow to limit number of executions Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 20/21] gputop: Allow to set delay interval Lucas De Marchi
2024-04-23 23:44 ` [PATCH i-g-t v2 21/21] lib/igt_drm_clients: lazy stat process Lucas De Marchi
2024-04-24 0:32 ` ✗ GitLab.Pipeline: warning for gputop: Add support for xe (rev2) Patchwork
2024-04-24 0:53 ` ✓ Fi.CI.BAT: success " Patchwork
2024-04-24 1:29 ` ✓ CI.xeBAT: " Patchwork
2024-04-24 11:47 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-04-24 15:23 ` ✗ CI.xeFULL: " Patchwork
2024-04-25 22:17 ` ✓ CI.xeBAT: success for gputop: Add support for xe (rev3) Patchwork
2024-04-25 22:20 ` ✓ Fi.CI.BAT: " Patchwork
2024-04-26 1:38 ` ✗ Fi.CI.IGT: failure " Patchwork
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=20240423234431.1959354-4-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=tursulin@ursulin.net \
--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