Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1153263ybt; Wed, 8 Jul 2020 23:20:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJye0FSdij4Vb65cKtvzUFoKgYNHL1ZjHlDZ59p8W+WGKPChy4j8SfYwoZlTzvpCZcDCcr21 X-Received: by 2002:a17:906:6441:: with SMTP id l1mr53267859ejn.169.1594275632248; Wed, 08 Jul 2020 23:20:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594275632; cv=none; d=google.com; s=arc-20160816; b=AX7tOMYoVwejp+Eo+kWBZmaXXONQJmOk1l6l1Ig/sBftw9rfCbIN78X6Z2j5JhgU7k FQ/rbRtmpI1sIUccMoR9sIUydKjJvHLQds1XW7o1EaO6kqpEEbKYPYlYDbzznlT7RAux +bzSyMOvh7wHiXCo1uH8+9xk/u2UyqL8A9feyH3AkRKWH2Uw8kTKF0MtxeksXz5ah1cg WkZsh1oTUy/h7Fr8Hr+SZsyYFDxTxPDJHsSjHy6irvarUMhYHe6KscwhUIBaviLsBe8l 3q530Kvk0mV3zX1CnSAICck+CvVpxx6Ik1kGBQm5+cKS/nv4o/qE7nRxUR5KXnBFFEmZ jzig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=KhZwoc2SCUpP770b/4tJ58Uu4y08B6iRQ7dPnzlnwD8=; b=bdNMTK1BYbeLkCSi1SHN+sI6cNxmK29BH67E1KGku9SgipctPLunTndvjw3cpjaHqd N5KO+pK+Q4pRsulAYggnBox0CYR4Qjh2rzDMs9KLBJxvEnBH71tBeDd4uwkakO8tbAsm FK8rndUvbADnpfc1BNHrojjHsh6CK0+nUz5JYnaH3DfO11AHhq1LBUHYIABc4yzLNT4C LhiifrYT7BJAIg82kVZBOe9vaIIafGRLACBxmGQamEgoF0q9wZQU2liJEORrBi1XWG3o x44abzObix5rqbmjqzs7nZcxupT7msjGeO0yJqdPX+hAVRasY6ZatuqAM0SCdg5aOsFb orBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=biInM4kE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c11si1438039edr.502.2020.07.08.23.20.09; Wed, 08 Jul 2020 23:20:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=biInM4kE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726302AbgGIGT4 (ORCPT + 99 others); Thu, 9 Jul 2020 02:19:56 -0400 Received: from linux.microsoft.com ([13.77.154.182]:37902 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725787AbgGIGTx (ORCPT ); Thu, 9 Jul 2020 02:19:53 -0400 Received: from sequoia.work.tihix.com (162-237-133-238.lightspeed.rcsntx.sbcglobal.net [162.237.133.238]) by linux.microsoft.com (Postfix) with ESMTPSA id 7E12A20B4909; Wed, 8 Jul 2020 23:19:51 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7E12A20B4909 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1594275592; bh=KhZwoc2SCUpP770b/4tJ58Uu4y08B6iRQ7dPnzlnwD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=biInM4kEQS4NasN3kKHheyzTLbgnWBk3+nP4pxVXoeom740lgyOMok/eZzqruVW/W coKsxQVN7PgraddnY4TqjfhoM4CZjn1SiNZSKl8pP3QTwmg/IlJWrkJQQR3NuOK0Yz dLQ/EdLr9q0zm5BXLSpPbt9F78sbINTo4tG+vJLY= From: Tyler Hicks To: Mimi Zohar , Dmitry Kasatkin Cc: James Morris , "Serge E . Hallyn" , Lakshmi Ramasubramanian , Prakhar Srivastava , linux-kernel@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, Janne Karhunen , Casey Schaufler Subject: [PATCH v3 01/12] ima: Have the LSM free its audit rule Date: Thu, 9 Jul 2020 01:19:00 -0500 Message-Id: <20200709061911.954326-2-tyhicks@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200709061911.954326-1-tyhicks@linux.microsoft.com> References: <20200709061911.954326-1-tyhicks@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ask the LSM to free its audit rule rather than directly calling kfree(). Both AppArmor and SELinux do additional work in their audit_rule_free() hooks. Fix memory leaks by allowing the LSMs to perform necessary work. Fixes: b16942455193 ("ima: use the lsm policy update notifier") Signed-off-by: Tyler Hicks Cc: Janne Karhunen Cc: Casey Schaufler Reviewed-by: Mimi Zohar --- * v3 - No change * v2 - Fixed build warning by dropping the 'return -EINVAL' from the stubbed out security_filter_rule_free() since it has a void return type - Added Mimi's Reviewed-by - Developed a follow-on patch to rename security_filter_rule_*() functions, to address Casey's request, but I'll submit it independently of this patch series since it is somewhat unrelated security/integrity/ima/ima.h | 5 +++++ security/integrity/ima/ima_policy.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 4515975cc540..59ec28f5c117 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -420,6 +420,7 @@ static inline void ima_free_modsig(struct modsig *modsig) #ifdef CONFIG_IMA_LSM_RULES #define security_filter_rule_init security_audit_rule_init +#define security_filter_rule_free security_audit_rule_free #define security_filter_rule_match security_audit_rule_match #else @@ -430,6 +431,10 @@ static inline int security_filter_rule_init(u32 field, u32 op, char *rulestr, return -EINVAL; } +static inline void security_filter_rule_free(void *lsmrule) +{ +} + static inline int security_filter_rule_match(u32 secid, u32 field, u32 op, void *lsmrule) { diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 66aa3e17a888..d7c268c2b0ce 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -258,7 +258,7 @@ static void ima_lsm_free_rule(struct ima_rule_entry *entry) int i; for (i = 0; i < MAX_LSM_RULES; i++) { - kfree(entry->lsm[i].rule); + security_filter_rule_free(entry->lsm[i].rule); kfree(entry->lsm[i].args_p); } kfree(entry); -- 2.25.1