← Back to branch summary

~ubuntu-branches/ubuntu/trusty/clamav/trusty-security

« back to all changes in this revision

Viewing changes to clamd/fan.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-11-20 14:29:18 UTC
  • mfrom: (0.47.10) (137.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20141120142918-slpjc6vqq139e49n
Tags: 0.98.5+addedllvm-0ubuntu0.14.04.1
* Updated to 0.98.5 to fix security issues, including CVE-2013-6497.
* Removed patches no longer needed:
  - d/p/0002-Sebastian-Andrzej-Siewior.patch
  - d/p/0003-configure-use-pkg-config-for-check-so-test-is-detect.patch
  - d/p/0004-Stop-using-a-cargo-culted-syscall-table-and-trust-th.patch
  - d/p/0005-configure.ac-patches-to-got-with-autoreconf-and-auto.patch
  - d/p/0006-Fix-STAT64-definition-and-add-missing-includes.patch
* Added patches from vivid to fix FTBFS, .so version and other issues:
  - d/p/0002-Add-an-additional-n-after-the-number-in-the-pidfile.patch
  - d/p/0003-unit_tests-increment-test-timeout-from-40secs-to-5mi.patch
  - d/p/0006-remove-unnecessary-harmful-flags-from-libclamav.pc.patch
  - d/p/0010-hardcode-LLVM-linker-flag-because-llvm-config-return.patch
  - d/p/0017-Bump-.so-version-number.patch
  - d/p/0018-llvm-don-t-use-system-libs.patch
* debian/clamav-docs.docs: use wildcards, as some docs have changed.
* debian/clamav-base.postinst.in: added new options.
* debian/clamav-base.config.in: added new options.
* debian/clamav-base.templates: added new options.
* debian/control: added libssl-dev BuildDepends.
* clamav-testfiles.install: removed rar files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clamd/fan.c
34
34
#include <string.h>
35
35
#include <errno.h>
36
36
 
37
 
#include <linux/fanotify.h>
38
 
#include "fan-syscalllib.h"
 
37
#include <sys/fanotify.h>
 
38
 
39
39
#include "fan.h"
40
40
 
41
41
#include "libclamav/clamav.h"
68
68
    context.filename = fname;
69
69
    context.virsize = 0;
70
70
    if(scan && cl_scandesc_callback(fmd->fd, &virname, NULL, tharg->engine, tharg->options, &context) == CL_VIRUS) {
71
 
        if(context.virsize)
72
 
            detstats_add(virname, fname, context.virsize, context.virhash);
73
71
        if(extinfo && context.virsize)
74
72
            logg("ScanOnAccess: %s: %s(%s:%llu) FOUND\n", fname, virname, context.virhash, context.virsize);
75
73
        else
277
275
        return -1;
278
276
 
279
277
    if(cl_scandesc_callback(fd, &virname, NULL, tharg->engine, tharg->options, &context) == CL_VIRUS) {
280
 
        if(context.virsize)
281
 
            detstats_add(virname, fname, context.virsize, context.virhash);
282
278
        if(extinfo && context.virsize)
283
279
            logg("ScanOnAccess: %s: %s(%s:%llu) FOUND\n", fname, virname, context.virhash, context.virsize);
284
280
        else