Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1154638ybt; Wed, 8 Jul 2020 23:23:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGIp2+nIIctuSgq4ciElT+r/0VhiLuDkBO8kOJ9e+Nuy1silqw10CrN7VqavyJa3O5yzQq X-Received: by 2002:a17:906:76d7:: with SMTP id q23mr55523429ejn.95.1594275786571; Wed, 08 Jul 2020 23:23:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594275786; cv=none; d=google.com; s=arc-20160816; b=pd5R1jWwy8uCi6tIkzIsySWNsWP8xAHskdksLaaii/da+L5KXsGfpYONuMkqGILR8j SChTWbXNR/fJxwQpQU4ISCxTb7cucI/FWOqOMTZ7NukJMcYcNsuRlvU0W8Shh8fEcS9r HDzI0c/y11a5HdDKV0+OeOD6T7Uc+IAuZ+o50g2G1YmwCGG9Olfn3ZcgH/S1gRM8puvV dRyJc0jFOnhY8nxzOsefOJjnflwKm87zOPneawp/sgDZlsAYU6baFaw3/9yGMPl3ra9F giY9BucCf9s12/IySOkT35iuShx9b9n9SmHDT93j3eMEaK8mzMsXgG7Im2i53Q+oSm+i F3Ig== 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=mFsiCcE03UNZBsGBJ7WJA9xJRygPO23LFXkCIABirYs=; b=eN8bUsDGNB3x5ki3Y7XOSPncxm89JNGgUZeMMrmX/sx0cqeBsDFYAsRJk2A1rDCZh3 SmZg8VD8YjGqRn1JCq4Bpi4HRVYUjVMan5dhhzT/fFwdyN4vyHOHRRe+6N9OvnCD9LrT PumKX89C44TOaHpLGc80s8WOPBo9Gmh8bwb2cBKUJ3RFHyPM1jMDI7q2gVodce/OLU4L nT1v4JZbExb/b1B/kDHyWT7facgKzQYe7Dc1+xy4O3FRnB29eT43Wf51xGCWkuwTVHY9 G5wueJop8qMkPzyX6N2DzNtr2ucburUMQAY5+ia+3T82eWw7QQmIvbZNv/0b/NYZw+n4 xA7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=CI3VBB9l; 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 17si1275617ejw.686.2020.07.08.23.22.44; Wed, 08 Jul 2020 23:23:06 -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=CI3VBB9l; 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 S1726385AbgGIGUF (ORCPT + 99 others); Thu, 9 Jul 2020 02:20:05 -0400 Received: from linux.microsoft.com ([13.77.154.182]:37982 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725787AbgGIGUC (ORCPT ); Thu, 9 Jul 2020 02:20:02 -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 AEE8E20B4908; Wed, 8 Jul 2020 23:20:00 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com AEE8E20B4908 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1594275601; bh=mFsiCcE03UNZBsGBJ7WJA9xJRygPO23LFXkCIABirYs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CI3VBB9llqU6KKQKyOH1s75SThDSfhmh/I+xrwByx4CB2dE2tzxku+HvARmu0bx6f 1MGXnjGk76xC/vWslwW19xAM4XUlTYn5n06pd1ed/CcmsfLXsFd9hMc2/mZ/wm6vxO 4kY46RZuSJRtBydQqhK+q8Ie4xtQlUPjJUrV6hqo= 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 Subject: [PATCH v3 03/12] ima: Free the entire rule if it fails to parse Date: Thu, 9 Jul 2020 01:19:02 -0500 Message-Id: <20200709061911.954326-4-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 Use ima_free_rule() to fix memory leaks of allocated ima_rule_entry members, such as .fsname and .keyrings, when an error is encountered during rule parsing. Set the args_p pointer to NULL after freeing it in the error path of ima_lsm_rule_init() so that it isn't freed twice. This fixes a memory leak seen when loading an rule that contains an additional piece of allocated memory, such as an fsname, followed by an invalid conditional: # echo "measure fsname=tmpfs bad=cond" > /sys/kernel/security/ima/policy -bash: echo: write error: Invalid argument # echo scan > /sys/kernel/debug/kmemleak # cat /sys/kernel/debug/kmemleak unreferenced object 0xffff98e7e4ece6c0 (size 8): comm "bash", pid 672, jiffies 4294791843 (age 21.855s) hex dump (first 8 bytes): 74 6d 70 66 73 00 6b a5 tmpfs.k. backtrace: [<00000000abab7413>] kstrdup+0x2e/0x60 [<00000000f11ede32>] ima_parse_add_rule+0x7d4/0x1020 [<00000000f883dd7a>] ima_write_policy+0xab/0x1d0 [<00000000b17cf753>] vfs_write+0xde/0x1d0 [<00000000b8ddfdea>] ksys_write+0x68/0xe0 [<00000000b8e21e87>] do_syscall_64+0x56/0xa0 [<0000000089ea7b98>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 Fixes: f1b08bbcbdaf ("ima: define a new policy condition based on the filesystem name") Fixes: 2b60c0ecedf8 ("IMA: Read keyrings= option from the IMA policy") Signed-off-by: Tyler Hicks --- * v3 - No change * v2 - No change security/integrity/ima/ima_policy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index bf00b966e87f..e458cd47c099 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -913,6 +913,7 @@ static int ima_lsm_rule_init(struct ima_rule_entry *entry, if (ima_rules == &ima_default_rules) { kfree(entry->lsm[lsm_rule].args_p); + entry->lsm[lsm_rule].args_p = NULL; result = -EINVAL; } else result = 0; @@ -1404,7 +1405,7 @@ ssize_t ima_parse_add_rule(char *rule) result = ima_parse_rule(p, entry); if (result) { - kfree(entry); + ima_free_rule(entry); integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL, NULL, op, "invalid-policy", result, audit_info); -- 2.25.1