From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AF1F3FB043; Wed, 20 May 2026 17:58:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299913; cv=none; b=ZtzGB7ChzQNIoK3RCM14ydtHPRr80HHnvFstVvpKdPGEk2oGWf7lURVLm+Zl7bCtORlaCYVVx7ki8nX6hsJgAq0dZ/4gDwApcs0ZTzNrdMRE5G4OzW3j/bnHbw86ntu4EEXSsKbIo+cTOLeXSwwZlEaWySlqzLThqOTpss/2cIM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299913; c=relaxed/simple; bh=VvFKalq5YoLz4mACGfMyH6V9IxgYClcus1tIfey8kbw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ryuerlnZ1EH+lKhUX8fXz9tXiYOk4ohVcHjphgowcw0Gb3nc+XCVbxQYWESFK3wosFUBwsxkacXI3iGtongHfHaCpvBaNpAtzI1X3ZI7nUpkEpj19bka8+VFp7BR1vJwVkRyO+jkaXFqncFKdQLbkzNro3S7YW1gBN3N4UF564s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GS8ngvAB; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GS8ngvAB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB9801F000E9; Wed, 20 May 2026 17:58:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779299910; bh=XE1lso2VA1HwUxyS1BtwR3x3bqRhA/S/nHQAD7l6NRg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GS8ngvABmL4AOWquKP25OkXonw/lhJuDiHVzyPEHaKFHd6oDFnbvJDtxtnrLj+qhB 3WAZQzVFTVUk9rbOL4b4K5EOYIRfVPHK0F/w/HG1NOCUVMw7S4GbjbV8X2TraiphYz tdPmMbp8W41dvgbkdIx5E6/QEVBKxU51P/LLHuBo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ricardo Robaina , Sergio Correia , Paul Moore Subject: [PATCH 6.18 891/957] audit: enforce AUDIT_LOCKED for AUDIT_TRIM and AUDIT_MAKE_EQUIV Date: Wed, 20 May 2026 18:22:54 +0200 Message-ID: <20260520162153.892963245@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162134.554764788@linuxfoundation.org> References: <20260520162134.554764788@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sergio Correia commit f9e1c1324b4d98d591a6f7568fdebf5cf456dfc2 upstream. AUDIT_ADD_RULE and AUDIT_DEL_RULE correctly check for AUDIT_LOCKED and return -EPERM, but AUDIT_TRIM and AUDIT_MAKE_EQUIV do not. This allows a process with CAP_AUDIT_CONTROL to modify directory tree watches and equivalence mappings even when the audit configuration has been locked, undermining the purpose of the lock. Add AUDIT_LOCKED checks to both commands. Cc: stable@vger.kernel.org Reviewed-by: Ricardo Robaina Assisted-by: Claude:claude-opus-4-6 Signed-off-by: Sergio Correia Signed-off-by: Paul Moore Signed-off-by: Greg Kroah-Hartman --- kernel/audit.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1462,6 +1462,8 @@ static int audit_receive_msg(struct sk_b err = audit_list_rules_send(skb, seq); break; case AUDIT_TRIM: + if (audit_enabled == AUDIT_LOCKED) + return -EPERM; audit_trim_trees(); audit_log_common_recv_msg(audit_context(), &ab, AUDIT_CONFIG_CHANGE); @@ -1474,6 +1476,8 @@ static int audit_receive_msg(struct sk_b size_t msglen = data_len; char *old, *new; + if (audit_enabled == AUDIT_LOCKED) + return -EPERM; err = -EINVAL; if (msglen < 2 * sizeof(u32)) break;