Backported upstream patch to unbreak e2guardian vs. temp files
This commit is contained in:
Robert Scheck
parent
f5e72a7773
commit
b63618be8b
137
clamav-0.99.2-temp-cleanup.patch
Normal file
137
clamav-0.99.2-temp-cleanup.patch
Normal file
@ -0,0 +1,137 @@
|
||||
https://github.com/vrtadmin/clamav-devel/commit/f5bc94cf01e6a19d5255c0e5f9a5bc2336f5a2b1
|
||||
backported (re-merge). See also:
|
||||
|
||||
- https://bugzilla.clamav.net/show_bug.cgi?id=11549
|
||||
- https://github.com/e2guardian/e2guardian/issues/159
|
||||
|
||||
--- clamav-0.99.2/libclamav/scanners.c 2016-04-22 17:02:19.000000000 +0200
|
||||
+++ clamav-0.99.2/libclamav/scanners.c.temp-cleanup 2017-11-17 00:59:14.295670694 +0100
|
||||
@@ -1342,37 +1342,33 @@
|
||||
return CL_CLEAN;
|
||||
}
|
||||
|
||||
- /* dump to disk only if explicitly asked to
|
||||
- * or if necessary to check relative offsets,
|
||||
- * otherwise we can process just in-memory */
|
||||
- if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) {
|
||||
- if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) {
|
||||
- cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n");
|
||||
- return ret;
|
||||
- }
|
||||
- if (ctx->engine->keeptmp)
|
||||
- cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname);
|
||||
- }
|
||||
-
|
||||
if(!(normalized = cli_malloc(SCANBUFF + maxpatlen))) {
|
||||
cli_dbgmsg("cli_scanscript: Unable to malloc %u bytes\n", SCANBUFF);
|
||||
- free(tmpname);
|
||||
return CL_EMEM;
|
||||
}
|
||||
-
|
||||
text_normalize_init(&state, normalized, SCANBUFF + maxpatlen);
|
||||
- ret = CL_CLEAN;
|
||||
-
|
||||
|
||||
if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) {
|
||||
- free(tmpname);
|
||||
- return ret;
|
||||
+ free(normalized);
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) {
|
||||
- cli_ac_freedata(&tmdata);
|
||||
- free(tmpname);
|
||||
- return ret;
|
||||
+ cli_ac_freedata(&tmdata);
|
||||
+ free(normalized);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ /* dump to disk only if explicitly asked to
|
||||
+ * or if necessary to check relative offsets,
|
||||
+ * otherwise we can process just in-memory */
|
||||
+ if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) {
|
||||
+ if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) {
|
||||
+ cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n");
|
||||
+ goto done;
|
||||
+ }
|
||||
+ if (ctx->engine->keeptmp)
|
||||
+ cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname);
|
||||
}
|
||||
|
||||
mdata[0] = &tmdata;
|
||||
@@ -1387,10 +1383,9 @@
|
||||
map_off += written;
|
||||
|
||||
if (write(ofd, state.out, state.out_pos) == -1) {
|
||||
- cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname);
|
||||
- close(ofd);
|
||||
- free(tmpname);
|
||||
- return CL_EWRITE;
|
||||
+ cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname);
|
||||
+ ret = CL_EWRITE;
|
||||
+ goto done;
|
||||
}
|
||||
text_normalize_reset(&state);
|
||||
}
|
||||
@@ -1409,11 +1404,6 @@
|
||||
funmap(*ctx->fmap);
|
||||
}
|
||||
*ctx->fmap = map;
|
||||
-
|
||||
- /* If we aren't keeping temps, delete the normalized file after scan. */
|
||||
- if(!(ctx->engine->keeptmp))
|
||||
- if (cli_unlink(tmpname)) ret = CL_EUNLINK;
|
||||
-
|
||||
} else {
|
||||
/* Since the above is moderately costly all in all,
|
||||
* do the old stuff if there's no relative offsets. */
|
||||
@@ -1421,11 +1411,8 @@
|
||||
if (troot) {
|
||||
cli_targetinfo(&info, 7, map);
|
||||
ret = cli_ac_caloff(troot, &tmdata, &info);
|
||||
- if (ret) {
|
||||
- cli_ac_freedata(&tmdata);
|
||||
- free(tmpname);
|
||||
- return ret;
|
||||
- }
|
||||
+ if (ret)
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
while(1) {
|
||||
@@ -1466,13 +1453,6 @@
|
||||
|
||||
}
|
||||
|
||||
- if(ctx->engine->keeptmp) {
|
||||
- free(tmpname);
|
||||
- if (ofd >= 0)
|
||||
- close(ofd);
|
||||
- }
|
||||
- free(normalized);
|
||||
-
|
||||
if(ret != CL_VIRUS || SCAN_ALL) {
|
||||
if ((ret = cli_exp_eval(ctx, troot, &tmdata, NULL, NULL)) == CL_VIRUS)
|
||||
viruses_found++;
|
||||
@@ -1481,9 +1461,19 @@
|
||||
viruses_found++;
|
||||
}
|
||||
|
||||
+done:
|
||||
+ free(normalized);
|
||||
cli_ac_freedata(&tmdata);
|
||||
cli_ac_freedata(&gmdata);
|
||||
|
||||
+ if (ofd != -1)
|
||||
+ close(ofd);
|
||||
+ if (tmpname != NULL) {
|
||||
+ if (!ctx->engine->keeptmp)
|
||||
+ cli_unlink(tmpname);
|
||||
+ free(tmpname);
|
||||
+ }
|
||||
+
|
||||
if (SCAN_ALL && viruses_found)
|
||||
return CL_VIRUS;
|
||||
|
||||
@ -59,7 +59,7 @@ Requires(postun): /bin/systemctl\
|
||||
Summary: End-user tools for the Clam Antivirus scanner
|
||||
Name: clamav
|
||||
Version: 0.99.2
|
||||
Release: 12%{?dist}
|
||||
Release: 13%{?dist}
|
||||
License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
|
||||
Group: Applications/File
|
||||
URL: http://www.clamav.net
|
||||
@ -87,6 +87,7 @@ Patch29: clamav-0.99.1-jitoff.patch
|
||||
Patch30: llvm-glibc.patch
|
||||
Patch31: clamav-0.99.1-setsebool.patch
|
||||
Patch32: fa15aa98c7d5e1d8fc22e818ebd089f2e53ebe1d.diff
|
||||
Patch33: clamav-0.99.2-temp-cleanup.patch
|
||||
|
||||
BuildRequires: autoconf automake gettext-devel libtool libtool-ltdl-devel
|
||||
BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel
|
||||
@ -418,6 +419,7 @@ The systemd initscripts for clamav-scanner.
|
||||
%apply -n30 -p1
|
||||
%apply -n31 -p1 -b .setsebool
|
||||
%apply -n32 -p1 -b .openssl_1.1.0
|
||||
%apply -n33 -p1 -b .temp-cleanup
|
||||
%{?apply_end}
|
||||
|
||||
install -p -m0644 %SOURCE300 clamav-milter/
|
||||
@ -900,6 +902,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Nov 26 2017 Robert Scheck <robert@fedoraproject.org> - 0.99.2-13
|
||||
- Backported upstream patch to unbreak e2guardian vs. temp files
|
||||
|
||||
* Fri Sep 15 2017 Sérgio Basto <sergio@serjux.com> - 0.99.2-12
|
||||
- Try fix rhbz #1473642
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user