diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-09 14:17:06 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-09 14:17:06 +0200 |
commit | a90a0bbf41e2fc251d31de604e06895ef1db05fa (patch) | |
tree | 1dcd66396a2abf9ace3a61ce04722fed35ca3e41 /common/state/state.c | |
parent | 091b51c0a9479d4d917d399e018f51db3d6332f9 (diff) | |
parent | a8a03551034bee6d2a66fc514342664f760bb4b6 (diff) | |
download | barebox-a90a0bbf41e2fc251d31de604e06895ef1db05fa.tar.gz barebox-a90a0bbf41e2fc251d31de604e06895ef1db05fa.tar.xz |
Merge branch 'for-next/state'
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; |