RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-02-26 09:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib_log: factor out crc checks

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2022-02-24 07:27:42 +01:00
parent 2feb959d71
commit 38c77848b9
1 changed files with 53 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
kernel/lib_log.c
View File

@ -657,6 +657,44 @@ done_free:
} }
static
int _check_crc(struct log_header *lh,
void *crc,
void *crc_buf,
int crc_len,
__u32 check_flags)
{
int res;
res = -EBADMSG;
if (check_flags & (MREF_CHKSUM_ANY - MREF_CHKSUM_MD5_OLD)) {
unsigned char checksum[MARS_DIGEST_SIZE];
unsigned char check_crc[LOG_CHKSUM_SIZE];
mars_digest(check_flags,
&used_log_digest,
checksum,
crc_buf, crc_len);
fold_crc(checksum, check_crc);
if (!memcmp(crc, check_crc, LOG_CHKSUM_SIZE))
res = 0;
} else if (lh->l_crc_old) {
unsigned char checksum[MARS_DIGEST_SIZE];
__u32 old_crc;
mars_digest(check_flags,
&used_log_digest,
checksum,
crc_buf, crc_len);
old_crc = *(int*)checksum;
if (old_crc == lh->l_crc_old)
res = 0;
}
return res;
}
int log_scan(void *buf, int log_scan(void *buf,
int len, int len,
loff_t file_pos, loff_t file_pos,
@ -687,6 +725,7 @@ int log_scan(void *buf,
int crc_len; int crc_len;
int decompr_len; int decompr_len;
int found_offset; int found_offset;
int crc_status;
void *new_buf = NULL; void *new_buf = NULL;
void *crc_buf; void *crc_buf;
@ -823,36 +862,20 @@ int log_scan(void *buf,
} }
} }
if (check_flags & (MREF_CHKSUM_ANY - MREF_CHKSUM_MD5_OLD)) { crc_status =
unsigned char checksum[MARS_DIGEST_SIZE]; _check_crc(lh,
unsigned char check_crc[LOG_CHKSUM_SIZE]; crc,
crc_buf,
mars_digest(check_flags, crc_len,
&used_log_digest, check_flags);
checksum, if (crc_status) {
crc_buf, crc_len); MARS_ERR(SCAN_TXT
"data checksumming mismatch, flags=0x%x len=%d/%d err=%d\n",
fold_crc(checksum, check_crc); SCAN_PAR,
if (unlikely(memcmp(crc, check_crc, LOG_CHKSUM_SIZE))) { check_flags,
MARS_ERR(SCAN_TXT "data checksumming mismatch, len=%d/%d\n", lh->l_len, crc_len,
SCAN_PAR, lh->l_len, crc_len); crc_status);
return -EBADMSG; return -EBADMSG;
}
} else if (lh->l_crc_old) {
unsigned char checksum[MARS_DIGEST_SIZE];
__u32 old_crc;
mars_digest(check_flags,
&used_log_digest,
checksum,
crc_buf, crc_len);
old_crc = *(int*)checksum;
if (unlikely(old_crc != lh->l_crc_old)) {
MARS_ERR(SCAN_TXT "data checksumming mismatch, len=%d/%d\n",
SCAN_PAR, lh->l_len, crc_len);
return -EBADMSG;
}
} }
// last check // last check