Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-02-07 06:16:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

pch_thermal: use user_memcpy() to write in a user buffer

Browse Source 
Change-Id: I8eccde638ba30051fcec375b7d616e1d1bddf5ed
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8854
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
This commit is contained in:
Jérôme Duval 2025-01-21 18:33:31 +01:00
parent 5a2be54dd0
commit 77f06cf2ae
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp
View File

@ -94,29 +94,38 @@ pch_thermal_read(void* _cookie, off_t position, void *buf, size_t* num_bytes)
return B_IO_ERROR;
if (position == 0) {
size_t max_len = *num_bytes;
char *str = (char *)buf;
char buffer[1024];
size_t maxLength = sizeof(buffer);
size_t totalCopied = 0;
char *str = (char *)buffer;
TRACE("pch_thermal: read()\n");
pch_thermal_control(device, drvOpGetThermalType, &therm_info, 0);
snprintf(str, max_len, " Critical Temperature: %" B_PRIu32 ".%"
int32 copied = snprintf(str, maxLength, " Critical Temperature: %" B_PRIu32 ".%"
B_PRIu32 " C\n", (therm_info.critical_temp / 10),
(therm_info.critical_temp % 10));
max_len -= strlen(str);
str += strlen(str);
snprintf(str, max_len, " Current Temperature: %" B_PRIu32 ".%"
maxLength -= copied;
str += copied;
totalCopied += copied;
copied = snprintf(str, maxLength, " Current Temperature: %" B_PRIu32 ".%"
B_PRIu32 " C\n", (therm_info.current_temp / 10),
(therm_info.current_temp % 10));
if (therm_info.hot_temp > 0) {
max_len -= strlen(str);
str += strlen(str);
snprintf(str, max_len, " Hot Temperature: %" B_PRIu32 ".%"
maxLength -= copied;
str += copied;
totalCopied += copied;
copied = snprintf(str, maxLength, " Hot Temperature: %" B_PRIu32 ".%"
B_PRIu32 " C\n", (therm_info.hot_temp / 10),
(therm_info.hot_temp % 10));
}
*num_bytes = strlen((char *)buf);
totalCopied += copied;
totalCopied = min_c(*num_bytes, totalCopied + 1);
if (user_memcpy((char*)buf, buffer, totalCopied) != B_OK)
return B_BAD_ADDRESS;
*num_bytes = totalCopied;
} else {
*num_bytes = 0;
}