github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

tools/power turbostat: Fix PMT mmap size and bounds check

Browse Source 
Remove assert(offset == 0), to allow non-zero PMT offsets.

Fix the pmt_mmio_open() mapping to round-up (offset + size).

Fix the offset bounds check to disallow running past the end of the region.

[lenb: commit message re-write]
Signed-off-by: Kaushlendra Kumar <kaushlendra.kumar@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Kaushlendra Kumar 2026-10-29 20:02:00 +05:30 committed by Len Brown
parent 3d6fc92be1
commit cfdb43387f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/power/x86/turbostat/turbostat.c
View File

@ -10266,13 +10266,11 @@ struct pmt_mmio *pmt_mmio_open(unsigned int target_guid)
break;
}
assert(offset == 0);
fd_pmt = openat(fd_telem_dir, "telem", O_RDONLY);
if (fd_pmt == -1)
goto loop_cleanup_and_break;
mmap_size = ROUND_UP_TO_PAGE_SIZE(size);
mmap_size = ROUND_UP_TO_PAGE_SIZE(offset + size);
mmio = mmap(0, mmap_size, PROT_READ, MAP_SHARED, fd_pmt, 0);
if (mmio != MAP_FAILED) {
if (debug)
@ -10444,7 +10442,7 @@ int pmt_add_counter(unsigned int guid, unsigned int seq, const char *name, enum
return 1;
}
if (offset >= mmio->size) {
if (offset > mmio->size || mmio->size - offset < 8) {
if (mode != PMT_OPEN_TRY) {
fprintf(stderr, "%s: offset %u outside of PMT MMIO size %u\n", __func__, offset, mmio->size);
exit(1);