Attachment 302748 Details for Bug 442556 – patch fixing problems described herein

[patch] patch fixing problems described herein

audit-1.7.3-fixes.patch (text/plain), 1.69 KB, created by Steve Grubb on 2008-04-17 13:47:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Grubb

Created: 2008-04-17 13:47:29 UTC

Size: 1.69 KB

patch

obsolete

>diff -urp audit-1.7/lib/deprecated.c audit-1.7.1/lib/deprecated.c
>--- audit-1.7/lib/deprecated.c	2008-02-29 15:39:00.000000000 -0500
>+++ audit-1.7.1/lib/deprecated.c	2008-04-07 10:48:50.000000000 -0400
>@@ -215,31 +215,16 @@ int audit_rule_fieldpair(struct audit_ru
> 		*v++ = '\0';
> 		op = AUDIT_NEGATE; // legacy
> 		// op = AUDIT_NOT_EQUAL;
>-	} else if ( (v = strstr(pair, ">=")) ) {
>-		*v++ = '\0';
>-		*v++ = '\0';
>-		op = AUDIT_GREATER_THAN_OR_EQUAL;
>-	} else if ( (v = strstr(pair, "<=")) ) {
>-		*v++ = '\0';
>-		*v++ = '\0';
>-		op = AUDIT_LESS_THAN_OR_EQUAL;
>-	} else if ( (v = strstr(pair, "&=")) ) {
>-		*v++ = '\0';
>-		*v++ = '\0';
>-		op = AUDIT_BIT_TEST;
>-	} else if ( (v = strstr(pair, "=")) ) {
>-		*v++ = '\0';
>-		op = 0; // legacy 
>-		// op = AUDIT_EQUAL;
> 	} else if ( (v = strstr(pair, ">")) ) {
>-		*v++ = '\0';
>-		op = AUDIT_GREATER_THAN;
>+		return -10;
> 	} else if ( (v = strstr(pair, "<")) ) {
>-		*v++ = '\0';
>-		op = AUDIT_LESS_THAN;
>+		return -10;
> 	} else if ( (v = strstr(pair, "&")) ) {
>+		return -10;
>+	} else if ( (v = strstr(pair, "=")) ) {
> 		*v++ = '\0';
>-		op = AUDIT_BIT_MASK;
>+		op = 0; // legacy 
>+		// op = AUDIT_EQUAL;
> 	}
> 
> 	if (v == NULL || f == v)
>diff -urp audit-1.7/src/auditd.c audit-1.7.1/src/auditd.c
>--- audit-1.7/src/auditd.c	2008-01-01 09:55:36.000000000 -0500
>+++ audit-1.7.1/src/auditd.c	2008-04-04 21:19:35.000000000 -0400
>@@ -150,7 +150,8 @@ static void distribute_event(struct audi
> 		enqueue_event(rep);
> 		if (yield)
> 			pthread_yield(); /* Let other thread try to log it. */
>-	}
>+	} else
>+		free(rep);	// This function takes custody of the memory
> 
> 	// FIXME: This is commented out since it fails to work. The
> 	// problem is that the logger thread free's the buffer. Probably

Actions: View | Diff

Attachments on bug 442556: 302748