From a0c26429e472a175ac6b1736c8687a19a76e97a9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 18 Jul 2017 15:14:45 +0200 Subject: state: backend_bucket_circular: fix old state reads When the circular bucket meta magic was not found, it is assumed that the whole written state is in the old on-storage format. In that case, the size of the circular bucket meta must not be subtracted from the read length, or the (complete_len > len) check in the raw backend's verify function will fail: state: Error, invalid data_len 16 in header, have data of len 24 Signed-off-by: Philipp Zabel Signed-off-by: Lucas Stach --- common/state/backend_bucket_circular.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'common/state') diff --git a/common/state/backend_bucket_circular.c b/common/state/backend_bucket_circular.c index 7c81cdfaff..3dcff5cf06 100644 --- a/common/state/backend_bucket_circular.c +++ b/common/state/backend_bucket_circular.c @@ -279,7 +279,10 @@ static int state_backend_bucket_circular_read(struct state_backend_storage_bucke } *buf_out = buf; - *len_out = read_len - sizeof(struct state_backend_storage_bucket_circular_meta); + /* When reading old state there is no circular bucket metadata */ + if (circ->last_written_length) + read_len -= sizeof(struct state_backend_storage_bucket_circular_meta); + *len_out = read_len; return ret; } -- cgit v1.2.3