From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91283C2BA19 for ; Sat, 11 Apr 2020 23:17:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 60E8920757 for ; Sat, 11 Apr 2020 23:17:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586647039; bh=lPahZPyMRAzAUjN4f8kWRZmmvE+vy3CpD1BES5lMn4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SfeT4mCVaauCiiiAqNsReNNvidm04E1O/Coi233vJB+HUnEO0emDGkmgqfj8hlt9k 5f4ZWnRGWwQG5y2L1q9qqjpOe4mhiA6lUTZlhn20Pg2fMKDGPIW7+/WpXTOU6PXeX8 EkvWpLr12Jfo8NflRVylB8DZodIH7/DCD0rkHMpY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730214AbgDKXOd (ORCPT ); Sat, 11 Apr 2020 19:14:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:56332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730802AbgDKXOc (ORCPT ); Sat, 11 Apr 2020 19:14:32 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 67DAC20769; Sat, 11 Apr 2020 23:14:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646873; bh=lPahZPyMRAzAUjN4f8kWRZmmvE+vy3CpD1BES5lMn4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IQngDTWkvQLtz0Whg2kDtj1Yf4ST0+jlLzFOI2OUel2DC5DB5dJqrJwN01dhVRZOn r6/2nDQiaJxM3+Abc0Sq39valrq3X87xP2KVtT8sBQFuvFWhiBF8TpJjUfGlAmLd1R 5QMT8d4lsJSj9TSW1Jg6BMDZeUHw+oqMs/4/etGo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Steve Grubb , Paul Moore , Sasha Levin , linux-audit@redhat.com Subject: [PATCH AUTOSEL 4.9 16/26] audit: CONFIG_CHANGE don't log internal bookkeeping as an event Date: Sat, 11 Apr 2020 19:14:03 -0400 Message-Id: <20200411231413.26911-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411231413.26911-1-sashal@kernel.org> References: <20200411231413.26911-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Steve Grubb [ Upstream commit 70b3eeed49e8190d97139806f6fbaf8964306cdb ] Common Criteria calls out for any action that modifies the audit trail to be recorded. That usually is interpreted to mean insertion or removal of rules. It is not required to log modification of the inode information since the watch is still in effect. Additionally, if the rule is a never rule and the underlying file is one they do not want events for, they get an event for this bookkeeping update against their wishes. Since no device/inode info is logged at insertion and no device/inode information is logged on update, there is nothing meaningful being communicated to the admin by the CONFIG_CHANGE updated_rules event. One can assume that the rule was not "modified" because it is still watching the intended target. If the device or inode cannot be resolved, then audit_panic is called which is sufficient. The correct resolution is to drop logging config_update events since the watch is still in effect but just on another unknown inode. Signed-off-by: Steve Grubb Signed-off-by: Paul Moore Signed-off-by: Sasha Levin --- kernel/audit_watch.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index 712469a3103ac..54b30c9bd8b13 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c @@ -316,8 +316,6 @@ static void audit_update_watch(struct audit_parent *parent, if (oentry->rule.exe) audit_remove_mark(oentry->rule.exe); - audit_watch_log_rule_change(r, owatch, "updated_rules"); - call_rcu(&oentry->rcu, audit_free_rule_rcu); } -- 2.20.1