kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: allow VIRTIO_BLK_T_GET_ID for read-only devices

Browse Source 
https://github.com/cloud-hypervisor/cloud-hypervisor/pull/7294 adjusted
the checks for read-only requests made to virtio-blk devices and started
rejecting VIRTIO_BLK_T_GET_ID requests. These requests do not perform
any writes and are needed in order to access device serials from within
the guest.

Signed-off-by: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
Connor Brewster
2025-12-06 12:55:26 -06:00
committed by Rob Bradford
parent 8de24b5f08
commit 41a8dcd9ba
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
block/src/lib.rs
View File

@@ -136,7 +136,7 @@ pub enum ExecuteError {
Read(#[source] GuestMemoryError), Read(#[source] GuestMemoryError),
#[error("Failed to read_exact")] #[error("Failed to read_exact")]
ReadExact(#[source] io::Error), ReadExact(#[source] io::Error),
#[error("Can't execute an operation other than `read` on a read-only device")] #[error("Can't execute an operation other than `read` or `get_id` on a read-only device")]
ReadOnly, ReadOnly,
#[error("Failed to seek")] #[error("Failed to seek")]
Seek(#[source] io::Error), Seek(#[source] io::Error),

4
virtio-devices/src/block.rs
View File

@@ -158,7 +158,9 @@ fn has_feature(features: u64, feature_flag: u64) -> bool {
impl BlockEpollHandler { impl BlockEpollHandler {
fn check_request(features: u64, request_type: RequestType) -> result::Result<(), ExecuteError> { fn check_request(features: u64, request_type: RequestType) -> result::Result<(), ExecuteError> {
if has_feature(features, VIRTIO_BLK_F_RO.into()) && request_type != RequestType::In { if has_feature(features, VIRTIO_BLK_F_RO.into())
&& !(request_type == RequestType::In || request_type == RequestType::GetDeviceId)
{
// For virtio spec compliance // For virtio spec compliance
// "A device MUST set the status byte to VIRTIO_BLK_S_IOERR for a write request // "A device MUST set the status byte to VIRTIO_BLK_S_IOERR for a write request
// if the VIRTIO_BLK_F_RO feature if offered, and MUST NOT write any data." // if the VIRTIO_BLK_F_RO feature if offered, and MUST NOT write any data."