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>,
Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Subject: [CI 1/6] lib/igt_drm_fdinfo: Fix wrong name len assert
Date: Tue, 30 Apr 2024 12:01:45 -0700 [thread overview]
Message-ID: <20240430190150.3654507-1-lucas.demarchi@intel.com> (raw)
When parsing engine name, at this point we have something like:
"drm-engine-render: 232409619162 ns"
^ ^
| |
name p
We are copying the engine name to the final destination, but
strlen(name) will actually contain the entire string. Since we already
know the name length, calculated previously, just use it for copying the
string.
Since each name is 256-bytes long, the assert doesn't trigger easily,
but it's better to be correct. And more efficient.
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
lib/igt_drm_fdinfo.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/igt_drm_fdinfo.c b/lib/igt_drm_fdinfo.c
index 18dbb5d0b..a1f4ad10d 100644
--- a/lib/igt_drm_fdinfo.c
+++ b/lib/igt_drm_fdinfo.c
@@ -90,8 +90,9 @@ static int parse_engine(char *line, struct drm_client_fdinfo *info,
if (found < 0) {
assert((info->num_engines + 1) < ARRAY_SIZE(info->names));
- assert((strlen(name) + 1) < sizeof(info->names[0]));
- strncpy(info->names[info->num_engines], name, name_len);
+ assert(name_len < sizeof(info->names[0]));
+ memcpy(info->names[info->num_engines], name, name_len);
+ info->names[info->num_engines][name_len] = '\0';
found = info->num_engines;
}
}
--
2.43.0
next 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 Lucas De Marchi [this message]
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 ` [CI 3/6] lib/igt_drm_fdinfo: Detect invalid drm-client-id Lucas De Marchi
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-1-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=tvrtko.ursulin@igalia.com \
--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