Skip to content

supervisor/filesystem: let alternative writers (BLE-FT, web workflow) bypass STA_PROTECT while they hold the lock #11048

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
dhalbert merged 2 commits into from
Jun 10, 2026
+12 −0
Merged

supervisor/filesystem: let alternative writers (BLE-FT, web workflow) bypass STA_PROTECT while they hold the lock #11048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adb362f
tools/ci_fetch_deps: add lib/mbedtls/ to nordic submodule list
Jun 9, 2026
a8924a8
supervisor/filesystem: let alternative writers (BLE-FT, web workflow)…
Jun 9, 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
11 changes: 11 additions & 0 deletions supervisor/shared/filesystem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,23 @@ bool filesystem_lock(fs_user_mount_t *fs_mount) {
return false;
}
fs_mount->lock_count += 1;
// CIRCUITPY-CHANGE: while a non-USB-MSC writer (BLE file transfer, web
// workflow, storage.remount) holds the filesystem lock, allow the
// FatFS f_open(FA_WRITE) path to bypass STA_PROTECT. Without this, the
// disk_ioctl(IOCTL_STATUS) -> filesystem_is_writable_by_python() check
// added by #10659 always sets STA_PROTECT on USB-device-capable boards,
// so even after the lock is held, f_open returns FR_WRITE_PROTECTED.
// USB MSC takes the lock via blockdev_lock() directly, NOT via
// filesystem_lock(), so this flag is never set on its behalf.
fs_mount->blockdev.flags |= MP_BLOCKDEV_FLAG_IGNORE_WRITE_PROTECTION;
return true;
}

void filesystem_unlock(fs_user_mount_t *fs_mount) {
fs_mount->lock_count -= 1;
if (fs_mount->lock_count == 0) {
// CIRCUITPY-CHANGE: clear the bypass when releasing the lock.
fs_mount->blockdev.flags &= ~MP_BLOCKDEV_FLAG_IGNORE_WRITE_PROTECTION;
blockdev_unlock(fs_mount);
}
}
Expand Down
1 change: 1 addition & 0 deletions tools/ci_fetch_deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def _all_submodules():
"mimxrt10xx": ["extmod/ulab/", "lib/tinyusb/", "lib/tlsf", "data/nvm.toml/"],
"nordic": [
"extmod/ulab/",
"lib/mbedtls/",
"lib/mp3/",
"lib/protomatter/",
"lib/tinyusb/",
Expand Down
Loading