From 6fbe9cab43c211b3899952c1280cd5e77f84620e Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 6 Jun 2021 14:50:07 +0200 Subject: [PATCH] src/file_bkf.c: improve Frama-C annotations --- src/file_bkf.c | 37 ++++++------------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) diff --git a/src/file_bkf.c b/src/file_bkf.c index 5aac25c5..a6b16c64 100644 --- a/src/file_bkf.c +++ b/src/file_bkf.c @@ -34,7 +34,7 @@ #include "log.h" /*@ - @ requires \valid(file_stat); + @ requires valid_register_header_check(file_stat); @*/ static void register_header_check_bkf(file_stat_t *file_stat); @@ -67,18 +67,11 @@ struct mtf_db_hdr } __attribute__ ((gcc_struct, __packed__)); /*@ - @ requires \valid(file_recovery); - @ requires \valid(file_recovery->handle); - @ requires \valid_read(&file_recovery->extension); - @ requires valid_read_string(file_recovery->extension); - @ requires \separated(file_recovery, file_recovery->handle, file_recovery->extension, &errno, &Frama_C_entropy_source); - @ requires \initialized(&file_recovery->time); - @ @ requires file_recovery->file_check == &file_check_bkf; + @ requires valid_file_check_param(file_recovery); + @ ensures valid_file_check_result(file_recovery); @ assigns *file_recovery->handle, errno, file_recovery->file_size; @ assigns Frama_C_entropy_source; - @ - @ ensures \valid(file_recovery->handle); @*/ static void file_check_bkf(file_recovery_t *file_recovery) { @@ -87,35 +80,17 @@ static void file_check_bkf(file_recovery_t *file_recovery) } /*@ - @ requires buffer_size > 0; - @ requires \valid_read(buffer+(0..buffer_size-1)); - @ requires \valid_read(file_recovery); - @ requires file_recovery->file_stat==\null || valid_read_string((char*)file_recovery->filename); - @ requires \valid(file_recovery_new); - @ requires file_recovery_new->blocksize > 0; - @ @ requires buffer_size >= sizeof(struct mtf_db_hdr); @ requires separation: \separated(&file_hint_bkf, buffer+(..), file_recovery, file_recovery_new); - @ - @ ensures \result == 0 || \result == 1; - @ ensures (\result == 1) ==> (file_recovery_new->file_stat == \null); - @ ensures (\result == 1) ==> (file_recovery_new->handle == \null); - @ ensures (\result == 1) ==> \initialized(&file_recovery_new->time); - @ ensures (\result == 1) ==> \initialized(&file_recovery_new->calculated_file_size); + @ 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); @ ensures (\result == 1) ==> file_recovery_new->file_size == 0; - @ ensures (\result == 1) ==> \initialized(&file_recovery_new->min_filesize); - @ ensures (\result == 1) ==> (file_recovery_new->data_check == \null || \valid_function(file_recovery_new->data_check)); - @ ensures (\result == 1) ==> (file_recovery_new->file_check == \null || \valid_function(file_recovery_new->file_check)); - @ ensures (\result == 1) ==> (file_recovery_new->file_rename == \null || \valid_function(file_recovery_new->file_rename)); - @ ensures (\result != 0) ==> file_recovery_new->extension != \null; - @ ensures (\result == 1) ==> (valid_read_string(file_recovery_new->extension)); - @ ensures (\result == 1) ==> \separated(file_recovery_new, file_recovery_new->extension); - @ @ ensures (\result == 1) ==> (file_recovery_new->time == 0); @ ensures (\result == 1) ==> (file_recovery_new->calculated_file_size == 0); @ ensures (\result == 1) ==> (file_recovery_new->min_filesize == 52); @ ensures (\result == 1) ==> (file_recovery_new->extension == file_hint_bkf.extension); @ ensures (\result == 1) ==> (file_recovery_new->file_check == &file_check_bkf); + @ assigns *file_recovery_new; @*/ static int header_check_bkf(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) {