mirror/clamav
1
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2026-05-09 16:13:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

onas: improving handling of fanotify read errors for large files.

Browse Source
This commit is contained in:
Mickey Sola
2015-10-14 09:37:59 -04:00
parent 43dec309fb
commit 2b122eb2cd
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
clamd/onaccess_fan.c
View File

@@ -142,7 +142,7 @@ void *onas_fan_th(void *arg)
sigaction(SIGSEGV, &act, NULL);
/* Initialize fanotify */
onas_fan_fd = fanotify_init(FAN_CLASS_CONTENT | FAN_UNLIMITED_QUEUE | FAN_UNLIMITED_MARKS, O_RDONLY);
onas_fan_fd = fanotify_init(FAN_CLASS_CONTENT | FAN_UNLIMITED_QUEUE | FAN_UNLIMITED_MARKS, O_LARGEFILE | O_RDONLY);
if(onas_fan_fd < 0) {
logg("!ScanOnAccess: fanotify_init failed: %s\n", cli_strerror(errno, err, sizeof(err)));
if(errno == EPERM)
@@ -226,7 +226,15 @@ void *onas_fan_th(void *arg)
ret = select(onas_fan_fd + 1, &rfds, NULL, NULL, NULL);
} while((ret == -1 && errno == EINTR) || reload);
while((bread = read(onas_fan_fd, buf, sizeof(buf))) > 0) {
while(((bread = read(onas_fan_fd, buf, sizeof(buf))) > 0) || errno == EOVERFLOW) {
if (errno == EOVERFLOW) {
logg("!ScanOnAccess: Internal error (failed to read data) ... %s\n", strerror(errno));
logg("!ScanOnAccess: File too large for fanotify ... recovering and continuing scans...\n");
errno = 0;
continue;
}
fmd = (struct fanotify_event_metadata *) buf;
while(FAN_EVENT_OK(fmd, bread)) {
scan = 1;
@@ -272,7 +280,7 @@ void *onas_fan_th(void *arg)
}
if(bread < 0)
logg("!ScanOnAccess: Internal error (failed to read data)\n");
logg("!ScanOnAccess: Internal error (failed to read data) ... %s\n", strerror(errno));
return NULL;
}