From 9ec38fdbc199286e03d8420c40d3e21be349433b Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Tue, 15 Jun 2021 17:14:07 +0200 Subject: [PATCH] src/file_gsm.c: improve Frama-C annotations --- src/file_gsm.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/file_gsm.c b/src/file_gsm.c index d3cf6b19..fa184f7a 100644 --- a/src/file_gsm.c +++ b/src/file_gsm.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_gsm(file_stat_t *file_stat); const file_hint_t file_hint_gsm= { @@ -52,14 +52,9 @@ struct block_header } __attribute__ ((gcc_struct, __packed__)); /*@ - @ requires buffer_size > 0; - @ requires (buffer_size&1)==0; - @ requires \valid_read(buffer+(0..buffer_size-1)); - @ requires \valid(file_recovery); @ requires file_recovery->data_check==&data_check_gsm; - @ requires file_recovery->calculated_file_size <= PHOTOREC_MAX_FILE_SIZE; - @ requires \separated(buffer, file_recovery); - @ ensures \result == DC_CONTINUE || \result == DC_STOP; + @ requires valid_data_check_param(buffer, buffer_size, file_recovery); + @ ensures valid_data_check_result(\result, file_recovery); @ assigns file_recovery->calculated_file_size; @*/ static data_check_t data_check_gsm(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) @@ -81,25 +76,25 @@ static data_check_t data_check_gsm(const unsigned char *buffer, const unsigned i } /*@ - @ requires buffer_size > 0; - @ 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 file_recovery_new->blocksize <= buffer_size; @ requires separation: \separated(&file_hint_gsm, buffer+(..), file_recovery, file_recovery_new); - @ ensures \result == 0 || \result == 1; - @ ensures \result!=0 ==> valid_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); @*/ static int header_check_gsm(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) { unsigned int i=0; + /*@ assert file_recovery_new->blocksize <= buffer_size; */ /*@ loop assigns i; */ for(i=0; (i+1) * sizeof(struct block_header) <= file_recovery_new->blocksize; i++) { + /*@ assert (i+1) * sizeof(struct block_header) <= file_recovery_new->blocksize; */ + /*@ assert (i+1) * sizeof(struct block_header) <= buffer_size; */ + /*@ assert \valid_read(buffer + (0 .. buffer_size-1)); */ + /*@ assert \valid_read(buffer + (0 .. (i+1) * sizeof(struct block_header)-1)); */ const struct block_header *hdr=(const struct block_header *)&buffer[i*sizeof(struct block_header)]; + /*@ assert \valid_read(hdr); */ if(hdr->marker < 0xd0 || hdr->marker > 0xdf) return 0; }