Stowage/clamav
2
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2025-10-19 18:33:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

bb#4669

Browse source
This commit is contained in:
aCaB 2012-05-08 15:34:27 +02:00
parent 2456a2bff4
commit ed98fae7ad
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue May 8 15:31:51 CEST 2012 (acab)
------------------------------------
* libclamav: detect read races and abort the scan with an error
(bb#4669)
Tue Apr 10 17:04:20 CEST 2012 (tk) Tue Apr 10 17:04:20 CEST 2012 (tk)
---------------------------------- ----------------------------------
* libclamav/pe.c: drop old header check (bb#4699) * libclamav/pe.c: drop old header check (bb#4699)

2
libclamav/cache.c
View file

@ -706,7 +706,7 @@ int cache_check(unsigned char *hash, cli_ctx *ctx) {
const void *buf; const void *buf;
size_t readme = todo < FILEBUFF ? todo : FILEBUFF; size_t readme = todo < FILEBUFF ? todo : FILEBUFF;
if(!(buf = fmap_need_off_once(map, at, readme))) if(!(buf = fmap_need_off_once(map, at, readme)))
return CL_VIRUS; return CL_EREAD;
todo -= readme; todo -= readme;
at += readme; at += readme;
cli_md5_update(&md5, buf, readme); cli_md5_update(&md5, buf, readme);

17
libclamav/scanners.c
View file

@ -2154,8 +2154,9 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)
unsigned char hash[16]; unsigned char hash[16];
bitset_t *old_hook_lsig_matches; bitset_t *old_hook_lsig_matches;
const char *filetype; const char *filetype;
int cache_clean = 0; int cache_clean = 0, res;
cli_dbgmsg("in magic_scandesc\n");
if(ctx->engine->maxreclevel && ctx->recursion > ctx->engine->maxreclevel) { if(ctx->engine->maxreclevel && ctx->recursion > ctx->engine->maxreclevel) {
cli_dbgmsg("cli_magic_scandesc: Archive recursion limit exceeded (%u, max: %u)\n", ctx->recursion, ctx->engine->maxreclevel); cli_dbgmsg("cli_magic_scandesc: Archive recursion limit exceeded (%u, max: %u)\n", ctx->recursion, ctx->engine->maxreclevel);
emax_reached(ctx); emax_reached(ctx);
@ -2190,10 +2191,12 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)
CALL_PRESCAN_CB(cb_pre_cache); CALL_PRESCAN_CB(cb_pre_cache);
perf_start(ctx, PERFT_CACHE); perf_start(ctx, PERFT_CACHE);
if(cache_check(hash, ctx) == CL_CLEAN) { res = cache_check(hash, ctx);
if(res != CL_VIRUS) {
perf_stop(ctx, PERFT_CACHE); perf_stop(ctx, PERFT_CACHE);
early_ret_from_magicscan(CL_CLEAN); early_ret_from_magicscan(res);
} }
perf_stop(ctx, PERFT_CACHE); perf_stop(ctx, PERFT_CACHE);
hashed_size = (*ctx->fmap)->len; hashed_size = (*ctx->fmap)->len;
old_hook_lsig_matches = ctx->hook_lsig_matches; old_hook_lsig_matches = ctx->hook_lsig_matches;
@ -2531,8 +2534,12 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)
/* CL_TYPE_HTML: raw HTML files are not scanned, unless safety measure activated via DCONF */ /* CL_TYPE_HTML: raw HTML files are not scanned, unless safety measure activated via DCONF */
if(type != CL_TYPE_IGNORED && (type != CL_TYPE_HTML || !(DCONF_DOC & DOC_CONF_HTML_SKIPRAW)) && !ctx->engine->sdb) { if(type != CL_TYPE_IGNORED && (type != CL_TYPE_HTML || !(DCONF_DOC & DOC_CONF_HTML_SKIPRAW)) && !ctx->engine->sdb) {
if(cli_scanraw(ctx, type, typercg, &dettype, hash) == CL_VIRUS) { res = cli_scanraw(ctx, type, typercg, &dettype, hash);
ret = cli_checkfp(hash, hashed_size, ctx); if(res != CL_CLEAN) {
if(res == CL_VIRUS)
ret = cli_checkfp(hash, hashed_size, ctx);
else
ret = res;
cli_bitset_free(ctx->hook_lsig_matches); cli_bitset_free(ctx->hook_lsig_matches);
ctx->hook_lsig_matches = old_hook_lsig_matches; ctx->hook_lsig_matches = old_hook_lsig_matches;
ret_from_magicscan(ret); ret_from_magicscan(ret);