Skip to content

fix(pawnio): cap broker SMBus batch delay #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyperb1iss merged 2 commits into from
May 19, 2026
+22 −2
Merged

fix(pawnio): cap broker SMBus batch delay #74

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5fe5c8
fix(pawnio): cap broker SMBus batch delay
hyperb1iss May 19, 2026
c55bcb0
refactor(pawnio): drop redundant u64 conversion in batch delay
hyperb1iss May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions crates/hypercolor-windows-pawnio/src/windows/broker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const SERVICE_STOP_WAIT_HINT: Duration = Duration::from_secs(10);
const PIPE_NAME: &str = r"\\.\pipe\hypercolor-smbus-v1";
const PIPE_SDDL: &str = "D:P(A;;GA;;;SY)(A;;GA;;;BA)(A;;GA;;;IU)";
const MAX_FRAME_BYTES: usize = 64 * 1024;
const MAX_BATCH_DELAY_MS: u64 = 1_000;
const CLIENT_CONNECT_ATTEMPTS: usize = 20;
const CLIENT_CONNECT_RETRY_DELAY: Duration = Duration::from_millis(10);
const DIRECT_ENV: &str = "HYPERCOLOR_PAWNIO_DIRECT";
Expand Down Expand Up @@ -576,7 +577,8 @@ impl BrokerState {
*transaction = BrokerSmBusTransaction::from(&transaction_value);
}
BrokerSmBusBatchOperation::Delay { duration_ms } => {
thread::sleep(Duration::from_millis(u64::from(*duration_ms)));
validate_batch_delay_ms(*duration_ms)?;
thread::sleep(Duration::from_millis(*duration_ms));
}
}
}
Expand All @@ -585,6 +587,16 @@ impl BrokerState {
}
}

fn validate_batch_delay_ms(duration_ms: u64) -> PawnIoResult<()> {
if duration_ms > MAX_BATCH_DELAY_MS {
return Err(PawnIoError::InvalidInput {
detail: format!("SMBus batch delay exceeds maximum of {MAX_BATCH_DELAY_MS} ms"),
});
}

Ok(())
}

fn lock_poisoned() -> PawnIoError {
PawnIoError::InvalidInput {
detail: "SMBus broker state lock poisoned".to_owned(),
Expand Down Expand Up @@ -888,7 +900,8 @@ mod tests {

use super::{
BrokerBusInfo, BrokerSmBusBatchOperation, BrokerSmBusDirection, BrokerSmBusTransaction,
SmBusBatchOperation, SmBusBlockData, SmBusDirection, SmBusTransaction, WindowsSmBusBusInfo,
MAX_BATCH_DELAY_MS, PawnIoError, SmBusBatchOperation, SmBusBlockData, SmBusDirection,
SmBusTransaction, WindowsSmBusBusInfo,
};

#[test]
Expand Down Expand Up @@ -958,4 +971,11 @@ mod tests {

assert_eq!(decoded, info);
}

#[test]
fn batch_delay_rejects_values_above_maximum() {
let error = super::validate_batch_delay_ms(MAX_BATCH_DELAY_MS + 1)
.expect_err("delay above max should be rejected");
assert!(matches!(error, PawnIoError::InvalidInput { .. }));
}
}
Loading