Fix start clamav-clamonacc-service

CVE-2022-20698.patch

@@ -1,31 +0,0 @@
-From 9a6bb57f89721db637f4ddb5b233c1c4e23d223a Mon Sep 17 00:00:00 2001
-From: Micah Snyder <micasnyd@cisco.com>
-Date: Wed, 15 Sep 2021 15:51:53 -0700
-Subject: [PATCH] OOXML: Fix invalid pointer dereference
-
-The OOXML parser in libclamav may try to extract an entry that is
-missing a file name. This results in an invalid 0x1 pointer dereference
-in the ZIP parser that is likely to crash the scanning application.
-
-This commit fixes the issue by requiring both the PartName (PN) *and*
-the ContentType (CT) variables to be non-NULL or else the entry will be
-skipped.
-
-Thank you Laurent Delosieres for reporting this issue.
----
- libclamav/ooxml.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libclamav/ooxml.c b/libclamav/ooxml.c
-index 16c436f1a5..644779432c 100644
---- a/libclamav/ooxml.c
-+++ b/libclamav/ooxml.c
-@@ -245,7 +245,7 @@ static cl_error_t ooxml_content_cb(int fd, const char *filepath, cli_ctx *ctx, c
-             cli_dbgmsg("%s: %s\n", localname, value);
-         }
- 
--        if (!CT && !PN) continue;
-+        if (!CT || !PN) continue;
- 
-         if (!xmlStrcmp(CT, (const xmlChar *)"application/vnd.openxmlformats-package.core-properties+xml")) {
-             /* default: /docProps/core.xml*/

clamav-check.patch

@@ -1,12 +0,0 @@
-diff -up clamav-0.103.0/unit_tests/check_jsnorm.c.check clamav-0.103.0/unit_tests/check_jsnorm.c
---- clamav-0.103.0/unit_tests/check_jsnorm.c.check	2020-09-12 18:27:10.000000000 -0600
-+++ clamav-0.103.0/unit_tests/check_jsnorm.c	2020-09-17 22:15:26.199957518 -0600
-@@ -247,7 +247,7 @@ static void tokenizer_test(const char *i
-     fd = open(filename, O_RDONLY);
-     if (fd < 0) {
-         jstest_teardown();
--        ck_assert_msg("failed to open output file: %s", filename);
-+        ck_assert_msg(0, "failed to open output file: %s", filename);
-     }
- 
-     diff_file_mem(fd, expected, len);

clamav-clamonacc-service.patch

@@ -1,10 +1,9 @@
-diff -up clamav-0.103.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service clamav-0.103.0/clamonacc/clamav-clamonacc.service.in
+--- ./clamonacc/clamav-clamonacc.service.in.clamonacc-service	2022-05-05 22:36:27.572671129 +0100
---- clamav-0.103.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service	2020-09-12 18:27:09.000000000 -0600
++++ ./clamonacc/clamav-clamonacc.service.in	2022-05-05 22:43:05.204324524 +0100
-+++ clamav-0.103.0/clamonacc/clamav-clamonacc.service.in	2020-09-18 19:49:35.400152760 -0600
 @@ -4,14 +4,12 @@
  [Unit]
  Description=ClamAV On-Access Scanner
- Documentation=man:clamonacc(8) man:clamd.conf(5) https://www.clamav.net/documents
+ Documentation=man:clamonacc(8) man:clamd.conf(5) https://docs.clamav.net/
 -Requires=clamav-daemon.service
 -After=clamav-daemon.service syslog.target network.target
 +After=clamd@scan.service syslog.target network.target
@@ -13,7 +12,7 @@ diff -up clamav-0.103.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service
  Type=simple
  User=root
 -ExecStartPre=/bin/bash -c "while [ ! -S /run/clamav/clamd.ctl ]; do sleep 1; done"
--ExecStart=@prefix@/sbin/clamonacc -F --config-file=@APP_CONFIG_DIRECTORY@/clamd.conf --log=/var/log/clamav/clamonacc.log --move=/root/quarantine
+-ExecStart=@prefix@/sbin/clamonacc -F --log=/var/log/clamav/clamonacc.log --move=/root/quarantine
 +ExecStart=@prefix@/sbin/clamonacc -F --config-file=/etc/clamd.d/scan.conf
  
  [Install]

clamav-return-val-process.patch

@@ -1,34 +0,0 @@
-From fe45bca164deeb1be053f5755546d71cc5dfd89b Mon Sep 17 00:00:00 2001
-From: caodongxia <315816521@qq.com>
-Date: Mon, 9 Aug 2021 14:27:22 +0800
-Subject: [PATCH] fix-return-val-process
-
----
- clamonacc/client/client.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/clamonacc/client/client.c b/clamonacc/client/client.c
-index 347070f..71c153d 100644
---- a/clamonacc/client/client.c
-+++ b/clamonacc/client/client.c
-@@ -207,12 +207,12 @@ int16_t onas_ping_clamd(struct onas_context **ctx)
- 
-     if (opt) {
-         attempt_str = cli_strdup(opt->strarg);
-+        if (NULL == attempt_str) {
-+            logg("!could not allocate memory for string\n");
-+            ret = -1;
-+            goto done;
-+        }
-         if (attempt_str) {
--            if (NULL == attempt_str) {
--                logg("!could not allocate memory for string\n");
--                ret = -1;
--                goto done;
--            }
-             interval_str = strchr(attempt_str, ':');
-             if ((NULL != interval_str) && (interval_str[0] != '\0')) {
-                 interval_str[0] = '\0';
--- 
-2.27.0
-

clamav.spec

@@ -1,7 +1,7 @@
 Name:           clamav
 Summary:        End-user tools for the Clam Antivirus scanner
 Version:        0.103.6
-Release:        1
+Release:        2
 
 License:        GPLv2 and Public Domain and bzip2-1.0.6 and Zlib and Apache-2.0
 URL:            https://www.clamav.net/
@@ -24,6 +24,7 @@ Source15:       clamd@.service
 Patch0001:      clamav-stats-deprecation.patch
 Patch0002:      clamav-default_confs.patch
 Patch0003:      clamav-0.99-private.patch
+Patch0005:	clamav-clamonacc-service.patch
 Patch0006:      clamav-freshclam.service.patch
 Patch0007:      clamav-type-conversion.patch
 Patch0008:      clamav-clamonacc-version-return.patch
@@ -412,6 +413,9 @@ test -e %_var/log/clamav-milter.log || {
 
 
 %changelog
+* Wed May 25 2022 houyingchao <houyingchao@h-partners.com> - 0.103.6-2
+- Fix start clamav-clamonacc-service
+
 * Mon May 16 2022 houyingchao <houyingchao@h-partners.com> - 0.103.6-1
 - Upgrade to 0.103.6
 - Fix CVE-2022-20785 CVE-2022-20771 CVE-2022-20770 CVE-2022-20792