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

rnull: fix geometry store check-then-act across lock scopes

Browse Source 
The blocksize/rotational/capacity/irqmode stores check powered under one
Mutex acquisition, drop the guard, then update under a second acquisition.
A concurrent power-on can create the live disk from stale geometry in
between, leaving powered==true with config != live disk.

Hold one guard for the powered check and the field update.

Signed-off-by: Qingxiao Xu <qingxiao@tamu.edu>
Link: https://msgid.link/20260908200845.405112-1-qingxiao@tamu.edu
Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
Link: https://patch.msgid.link/20260929-rust-block-for-v7-4-rc1-b4-v1-7-642a4c1aebd7@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Qingxiao Xu 2026-09-29 11:34:05 +02:00 committed by Jens Axboe
parent c595572d0e
commit 7ac697d4a0
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/block/rnull/configfs.rs
View File

@ -186,7 +186,8 @@ impl configfs::AttributeOperations<1> for DeviceConfig {
}
fn store(this: &DeviceConfig, page: &[u8]) -> Result {
if this.data.lock().powered {
let mut guard = this.data.lock();
if guard.powered {
return Err(EBUSY);
}
@ -194,7 +195,7 @@ fn store(this: &DeviceConfig, page: &[u8]) -> Result {
let value = text.parse::<u32>().map_err(|_| EINVAL)?;
GenDiskBuilder::validate_block_size(value)?;
this.data.lock().block_size = value;
guard.block_size = value;
Ok(())
}
}
@ -216,11 +217,12 @@ impl configfs::AttributeOperations<2> for DeviceConfig {
}
fn store(this: &DeviceConfig, page: &[u8]) -> Result {
if this.data.lock().powered {
let mut guard = this.data.lock();
if guard.powered {
return Err(EBUSY);
}
this.data.lock().rotational = kstrtobool_bytes(page)?;
guard.rotational = kstrtobool_bytes(page)?;
Ok(())
}
@ -237,14 +239,15 @@ impl configfs::AttributeOperations<3> for DeviceConfig {
}
fn store(this: &DeviceConfig, page: &[u8]) -> Result {
if this.data.lock().powered {
let mut guard = this.data.lock();
if guard.powered {
return Err(EBUSY);
}
let text = core::str::from_utf8(page)?.trim();
let value = text.parse::<u64>().map_err(|_| EINVAL)?;
this.data.lock().capacity_mib = value;
guard.capacity_mib = value;
Ok(())
}
}
@ -260,14 +263,15 @@ impl configfs::AttributeOperations<4> for DeviceConfig {
}
fn store(this: &DeviceConfig, page: &[u8]) -> Result {
if this.data.lock().powered {
let mut guard = this.data.lock();
if guard.powered {
return Err(EBUSY);
}
let text = core::str::from_utf8(page)?.trim();
let value = text.parse::<u8>().map_err(|_| EINVAL)?;
this.data.lock().irq_mode = IRQMode::try_from(value)?;
guard.irq_mode = IRQMode::try_from(value)?;
Ok(())
}
}