mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

clamav: fix fd leakage

Browse source
This commit is contained in:
Robin Gloster 2018-01-26 18:01:26 +01:00
parent 31e388dff2
commit 15ce244d0c
No known key found for this signature in database
GPG key ID: D5C458DF6DD97EDF
2 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/tools/security/clamav/default.nix
View file

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre
];
patches = [ ./fd-leak.patch ];
configureFlags = [
"--sysconfdir=/etc/clamav"
"--disable-llvm" # enabling breaks the build at the moment

49
pkgs/tools/security/clamav/fd-leak.patch Normal file
View file

@ -0,0 +1,49 @@
--- a/libclamav/scanners.c 2018-01-26 16:59:00.820231425 +0100
+++ b/libclamav/scanners.c 2018-01-26 17:39:07.523633805 +0100
@@ -1366,12 +1366,14 @@
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);
+ 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);
+ free(normalized);
return ret;
}
@@ -1390,6 +1392,7 @@
cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname);
close(ofd);
free(tmpname);
+ free(normalized);
return CL_EWRITE;
}
text_normalize_reset(&state);
@@ -1424,6 +1427,8 @@
if (ret) {
cli_ac_freedata(&tmdata);
free(tmpname);
+ free(normalized);
+ close(ofd);
return ret;
}
}
@@ -1466,11 +1471,9 @@
}
- if(ctx->engine->keeptmp) {
- free(tmpname);
- if (ofd >= 0)
- close(ofd);
- }
+ if (ofd >= 0)
+ close(ofd);
+ free(tmpname);
free(normalized);
if(ret != CL_VIRUS || SCAN_ALL) {