From 95d9c2b7b4c40a3dbb1bfccbfcf050ffc1377a09 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 6 Jun 2021 16:23:24 +0200 Subject: [PATCH] src/file_cow.c: improve Frama-C annotations --- src/file_cow.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/file_cow.c b/src/file_cow.c index 1a401f37..80479bac 100644 --- a/src/file_cow.c +++ b/src/file_cow.c @@ -33,7 +33,7 @@ #include "common.h" #include "log.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_cow(file_stat_t *file_stat); const file_hint_t file_hint_cow= { @@ -78,14 +78,10 @@ typedef struct QCowHeader { /*@ @ requires buffer_size >= sizeof(QCowHeader_t); - @ requires \valid_read(buffer+(0..buffer_size-1)); - @ requires valid_file_recovery(file_recovery); - @ requires \valid(file_recovery_new); - @ requires file_recovery_new->blocksize > 0; @ requires separation: \separated(&file_hint_cow, buffer+(..), file_recovery, file_recovery_new); + @ requires valid_header_check_param(buffer, buffer_size, safe_header_only, file_recovery, file_recovery_new); + @ ensures valid_header_check_result(\result, file_recovery_new); @ assigns *file_recovery_new; - @ ensures \result == 0 || \result == 1; - @ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @*/ static int header_check_qcow1(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new) { @@ -102,14 +98,10 @@ static int header_check_qcow1(const unsigned char *buffer, const unsigned int bu /*@ @ requires buffer_size >= sizeof(QCowHeader2_t); - @ requires \valid_read(buffer+(0..buffer_size-1)); - @ requires valid_file_recovery(file_recovery); - @ requires \valid(file_recovery_new); - @ requires file_recovery_new->blocksize > 0; @ requires separation: \separated(&file_hint_cow, buffer+(..), file_recovery, file_recovery_new); + @ requires valid_header_check_param(buffer, buffer_size, safe_header_only, file_recovery, file_recovery_new); + @ ensures valid_header_check_result(\result, file_recovery_new); @ assigns *file_recovery_new; - @ ensures \result == 0 || \result == 1; - @ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @*/ static int header_check_qcow2(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new) {