From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steve Grubb <sgrubb@redhat.com>
Subject: Re: [PATCH 1/2] Revert "In auditctl,
	when resetting lost request status output afterwards"
Date: Mon, 27 Nov 2017 17:16:19 -0500
Message-ID: <1957057.GYqr2Mv1DQ@x2>
References: <1511395257-6321-1-git-send-email-rgb@redhat.com>
	<1511395257-6321-2-git-send-email-rgb@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <linux-audit-bounces@redhat.com>
In-Reply-To: <1511395257-6321-2-git-send-email-rgb@redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/linux-audit>,
	<mailto:linux-audit-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/linux-audit>
List-Post: <mailto:linux-audit@redhat.com>
List-Help: <mailto:linux-audit-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/linux-audit>,
	<mailto:linux-audit-request@redhat.com?subject=subscribe>
Sender: linux-audit-bounces@redhat.com
Errors-To: linux-audit-bounces@redhat.com
To: Richard Guy Briggs <rgb@redhat.com>
Cc: linux-audit@redhat.com
List-Id: linux-audit@redhat.com

On Wednesday, November 22, 2017 7:00:56 PM EST Richard Guy Briggs wrote:
> This reverts commit 56a708761347ba49ccdc2378d31133f01129f4f2.
> 
> Conflicts:
> 	ChangeLog
> ---
>  ChangeLog      | 1 +
>  src/auditctl.c | 7 ++++---
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/ChangeLog b/ChangeLog
> index de9ae56..4e9ca3d 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -4,6 +4,7 @@
>  - In auditctl, when resetting lost request status output afterwards
>  - AVC report from aureport was missing result column header (#1511606)
>  - Add SOFTWARE_UPDATE event
> +- REVERT: In auditctl, when resetting lost request status output afterwards

Applied. But its best not to mess with the Changelog because there is no 
guarantee this patch goes in before other work.  As it turns out, it failed to 
apply and then I deleted this chunk and everything was OK.

-Steve


>  2.8.1
>  - Fix NULL ptr dereference in audispd plugin_dir parser
> diff --git a/src/auditctl.c b/src/auditctl.c
> index 0b301c1..a1c05b5 100644
> --- a/src/auditctl.c
> +++ b/src/auditctl.c
> @@ -1064,9 +1064,10 @@ process_keys:
>  #endif
>  		break;
>  	case 3:
> -		if ((rc = audit_reset_lost(fd)) >= 0)
> -			audit_request_status(fd);
> -		else {
> +		if ((rc = audit_reset_lost(fd)) >= 0) {
> +			audit_msg(LOG_INFO, "lost: %u", rc);
> +			return -2;
> +		} else {
>  			audit_number_to_errmsg(rc, long_opts[lidx].name);
>  			retval = -1;
>  		}