diff options
| author | Daniel Schultz <d.schultz@phytec.de> | 2018-04-12 11:13:01 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-16 09:54:11 +0200 |
| commit | 67c1c0853fa06bcbc1725e93b6ad9942e80a1e56 (patch) | |
| tree | e7595ca6de862364a112767a6c3ca09995f62833 /common/state/state.c | |
| parent | 6377d27b951bfddc67bba16e83f79ae1d9fa8eb9 (diff) | |
| download | barebox-67c1c0853fa06bcbc1725e93b6ad9942e80a1e56.tar.gz barebox-67c1c0853fa06bcbc1725e93b6ad9942e80a1e56.tar.xz | |
common: state: Add property to protect existing data
After an update to a newer barebox version with an enabled state
framework, existing data in storage memories could be overwritten.
Add a new property to check in front of every write task, if the meta
magic field only contains the magic number, zeros or ones.
Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/state/state.c')
| -rw-r--r-- | common/state/state.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/common/state/state.c b/common/state/state.c index 73dfb586e7..25d9502111 100644 --- a/common/state/state.c +++ b/common/state/state.c @@ -44,6 +44,8 @@ int state_save(struct state *state) void *buf; ssize_t len; int ret; + struct state_backend_storage_bucket *bucket; + struct state_backend_storage *storage; if (!state->dirty) return 0; @@ -55,7 +57,19 @@ int state_save(struct state *state) return ret; } - ret = state_storage_write(&state->storage, buf, len); + storage = &state->storage; + if (state->keep_prev_content) { + bool has_content = 0; + list_for_each_entry(bucket, &storage->buckets, bucket_list) + has_content |= bucket->wrong_magic; + if (has_content) { + dev_err(&state->dev, "Found foreign content on backend, won't overwrite.\n"); + ret = -EPERM; + goto out; + } + } + + ret = state_storage_write(storage, buf, len); if (ret) { dev_err(&state->dev, "Failed to write packed state, %d\n", ret); goto out; @@ -623,6 +637,9 @@ struct state *state_new_from_node(struct device_node *node, bool readonly) of_property_read_string(node, "backend-storage-type", &storage_type); + state->keep_prev_content = of_property_read_bool(node, + "keep-previous-content"); + ret = state_format_init(state, backend_type, node, alias); if (ret) goto out_release_state; |