i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme, mmc: Fix SMAP violations in B_GET_MEDIA_STATUS.

Browse Source 
Fixes #18736.
This commit is contained in:
Augustin Cavalier
2024-01-06 12:07:25 -05:00
parent 3433ec7334
commit 12bba3817d
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/mmc/mmc_disk.cpp
+2 -3
View File
@@ -573,9 +573,8 @@ mmc_block_ioctl(void* cookie, uint32 op, void* buffer, size_t length)
if (buffer == NULL || length < sizeof(status_t)) if (buffer == NULL || length < sizeof(status_t))
return B_BAD_VALUE; return B_BAD_VALUE;
*(status_t *)buffer = B_OK; status_t status = B_OK;
return B_OK; return user_memcpy(buffer, &status, sizeof(status_t));
break;
} }
case B_GET_DEVICE_SIZE: case B_GET_DEVICE_SIZE:
src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
+1 -4
View File
@@ -937,10 +937,7 @@ nvme_disk_ioctl(void* cookie, uint32 op, void* buffer, size_t length)
switch (op) { switch (op) {
case B_GET_MEDIA_STATUS: case B_GET_MEDIA_STATUS:
{ {
*(status_t *)buffer = info->media_status; return user_memcpy(buffer, &info->media_status, sizeof(status_t));
info->media_status = B_OK;
return B_OK;
break;
} }
case B_GET_DEVICE_SIZE: case B_GET_DEVICE_SIZE: