diff options
| author | Kees Cook <keescook@chromium.org> | 2013-02-21 10:38:46 -0800 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-02-21 17:41:59 -0800 |
| commit | e6cf2c21a1cd6fc46b6adcaadc865e2f8bd4874e (patch) | |
| tree | 20f81ac36c91744e00338dd93ccf1c25ad5d9b13 | |
| parent | c9bf348239af9bcf6c1e9eb6b83cd0ad9b3ea084 (diff) | |
| download | vboot-e6cf2c21a1cd6fc46b6adcaadc865e2f8bd4874e.tar.gz | |
mount-encrypted: issue sync()s between umount stages
In an effort to reduce the chances of a kernel bug wrecking filesystems
during encrypted-stateful shutdown, add explicit sync() calls during
shutdown.
BUG=chrome-os-partner:17610
TEST=link build, shutdown with simulated panic in LOOP_CLR_FD results in
successful journal replays
BRANCH=None
Change-Id: I4be981ebd0270d275ae81a79e3195bc72b70d984
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/43736
Reviewed-by: Grant Grundler <grundler@chromium.org>
| -rw-r--r-- | utility/mount-encrypted.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/utility/mount-encrypted.c b/utility/mount-encrypted.c index 98e63e74..9dbedc2a 100644 --- a/utility/mount-encrypted.c +++ b/utility/mount-encrypted.c @@ -1063,6 +1063,12 @@ static int shutdown(void) } } + /* + * Force syncs to make sure we don't tickle racey/buggy kernel + * routines that might be causing crosbug.com/p/17610. + */ + sync(); + /* Optionally run fsck on the device after umount. */ if (getenv("MOUNT_ENCRYPTED_FSCK")) { char *cmd; @@ -1081,12 +1087,15 @@ static int shutdown(void) INFO("Removing %s.", dmcrypt_dev); if (!dm_teardown(dmcrypt_dev)) ERROR("dm_teardown(%s)", dmcrypt_dev); + sync(); INFO("Unlooping %s (named %s).", block_path, dmcrypt_name); if (!loop_detach_name(dmcrypt_name)) { ERROR("loop_detach_name(%s)", dmcrypt_name); return EXIT_FAILURE; } + sync(); + return EXIT_SUCCESS; } |