From patchwork Thu Jan 9 02:42:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lakshmi Ramasubramanian X-Patchwork-Id: 11324993 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AEA901580 for ; Thu, 9 Jan 2020 02:42:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D05220721 for ; Thu, 9 Jan 2020 02:42:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="Czf4DCV7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727838AbgAICmW (ORCPT ); Wed, 8 Jan 2020 21:42:22 -0500 Received: from linux.microsoft.com ([13.77.154.182]:54354 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727770AbgAICmV (ORCPT ); Wed, 8 Jan 2020 21:42:21 -0500 Received: from nramas-ThinkStation-P520.corp.microsoft.com (unknown [131.107.174.108]) by linux.microsoft.com (Postfix) with ESMTPSA id DB61320B4798; Wed, 8 Jan 2020 18:42:20 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com DB61320B4798 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1578537740; bh=02pnekwS5pqJjTWBYRwWD6abrQnY9Vivr/pyuvIfUyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Czf4DCV77vLfrKVmEsmV1m57zT6rtIGaUwvulNvKsqk03QGPF4au2DmNwGSieTfbw OV78ZSrzohvQeTsGz9gJ9TtcmP9dOLzHfTFpmrZ37yiIi7jB253Kr9sSZwvvZg3D83 SMMkRx5HPDBWUpavAj7fh0+WDf5BtEytCEUyTNtc= From: Lakshmi Ramasubramanian To: =zohar@linux.ibm.com, James.Bottomley@HansenPartnership.com, linux-integrity@vger.kernel.org Cc: dhowells@redhat.com, arnd@arndb.de, matthewgarrett@google.com, sashal@kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org Subject: [PATCH v8 1/3] IMA: Define workqueue for early boot key measurements Date: Wed, 8 Jan 2020 18:42:14 -0800 Message-Id: <20200109024216.3350-2-nramas@linux.microsoft.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200109024216.3350-1-nramas@linux.microsoft.com> References: <20200109024216.3350-1-nramas@linux.microsoft.com> Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Measuring keys requires a custom IMA policy to be loaded. Keys created or updated before a custom IMA policy is loaded should be queued and the keys should be processed after a custom policy is loaded. This patch defines workqueue for queuing keys when a custom IMA policy has not yet been loaded. A flag namely ima_process_keys is used to check if the key should be queued or should be processed immediately. Signed-off-by: Lakshmi Ramasubramanian Reported-by: kernel test robot # sleeping function called from invalid context Reported-by: kbuild test robot # sparse symbol ima_queued_key() should be static --- security/integrity/ima/ima.h | 15 +++ security/integrity/ima/ima_asymmetric_keys.c | 115 +++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index f06238e41a7c..c7fdf3d66b98 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -205,6 +205,21 @@ extern const char *const func_tokens[]; struct modsig; +#ifdef CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS +/* + * To track keys that need to be measured. + */ +struct ima_key_entry { + struct list_head list; + void *payload; + size_t payload_len; + char *keyring_name; +}; +void ima_process_queued_keys(void); +#else +static inline void ima_process_queued_keys(void) {} +#endif /* CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS */ + /* LIM API function definitions */ int ima_get_action(struct inode *inode, const struct cred *cred, u32 secid, int mask, enum ima_hooks func, int *pcr, diff --git a/security/integrity/ima/ima_asymmetric_keys.c b/security/integrity/ima/ima_asymmetric_keys.c index fea2e7dd3b09..1d56f003f1a7 100644 --- a/security/integrity/ima/ima_asymmetric_keys.c +++ b/security/integrity/ima/ima_asymmetric_keys.c @@ -14,6 +14,121 @@ #include #include "ima.h" +/* + * Flag to indicate whether a key can be processed + * right away or should be queued for processing later. + */ +static bool ima_process_keys; + +/* + * To synchronize access to the list of keys that need to be measured + */ +static DEFINE_SPINLOCK(ima_keys_lock); +static LIST_HEAD(ima_keys); + +static void ima_free_key_entry(struct ima_key_entry *entry) +{ + if (entry) { + kfree(entry->payload); + kfree(entry->keyring_name); + kfree(entry); + } +} + +static struct ima_key_entry *ima_alloc_key_entry( + struct key *keyring, + const void *payload, size_t payload_len) +{ + int rc = 0; + struct ima_key_entry *entry; + + entry = kzalloc(sizeof(*entry), GFP_KERNEL); + if (entry) { + entry->payload = kmemdup(payload, payload_len, GFP_KERNEL); + entry->keyring_name = kstrdup(keyring->description, + GFP_KERNEL); + entry->payload_len = payload_len; + } + + if ((entry == NULL) || (entry->payload == NULL) || + (entry->keyring_name == NULL)) { + rc = -ENOMEM; + goto out; + } + + INIT_LIST_HEAD(&entry->list); + +out: + if (rc) { + ima_free_key_entry(entry); + entry = NULL; + } + + return entry; +} + +static bool ima_queue_key(struct key *keyring, const void *payload, + size_t payload_len) +{ + bool queued = false; + struct ima_key_entry *entry; + + entry = ima_alloc_key_entry(keyring, payload, payload_len); + if (!entry) + return false; + + spin_lock(&ima_keys_lock); + if (!ima_process_keys) { + list_add_tail(&entry->list, &ima_keys); + queued = true; + } + spin_unlock(&ima_keys_lock); + + if (!queued) + ima_free_key_entry(entry); + + return queued; +} + +/* + * ima_process_queued_keys() - process keys queued for measurement + * + * This function sets ima_process_keys to true and processes queued keys. + * From here on keys will be processed right away (not queued). + */ +void ima_process_queued_keys(void) +{ + struct ima_key_entry *entry, *tmp; + bool process = false; + + if (ima_process_keys) + return; + + /* + * Since ima_process_keys is set to true, any new key will be + * processed immediately and not be queued to ima_keys list. + * First one setting the ima_process_keys flag to true will + * process the queued keys. + */ + spin_lock(&ima_keys_lock); + if (!ima_process_keys) { + ima_process_keys = true; + process = true; + } + spin_unlock(&ima_keys_lock); + + if (!process) + return; + + list_for_each_entry_safe(entry, tmp, &ima_keys, list) { + process_buffer_measurement(entry->payload, entry->payload_len, + entry->keyring_name, KEY_CHECK, 0, + entry->keyring_name); + list_del(&entry->list); + ima_free_key_entry(entry); + } +} + /** * ima_post_key_create_or_update - measure asymmetric keys * @keyring: keyring to which the key is linked to From patchwork Thu Jan 9 02:42:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lakshmi Ramasubramanian X-Patchwork-Id: 11325001 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 288B7109A for ; Thu, 9 Jan 2020 02:42:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0787020705 for ; Thu, 9 Jan 2020 02:42:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="VvE91D2M" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727955AbgAICm2 (ORCPT ); Wed, 8 Jan 2020 21:42:28 -0500 Received: from linux.microsoft.com ([13.77.154.182]:54352 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727703AbgAICmW (ORCPT ); Wed, 8 Jan 2020 21:42:22 -0500 Received: from nramas-ThinkStation-P520.corp.microsoft.com (unknown [131.107.174.108]) by linux.microsoft.com (Postfix) with ESMTPSA id 0DBE420B479A; Wed, 8 Jan 2020 18:42:21 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 0DBE420B479A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1578537741; bh=NKgRkmzoN0y0dLTJVKQzqC1pv+0h4bapnXypM9TVYnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VvE91D2MOF7836gBo9IINwvVUQZf02Id3jcL0JnZWmBmLo/zhNteBZmZO9efSjymw 5FMHasQf+KBkmGJ2Rgo6XR/DWSx8eMe7NMMQ0mqxFnltCScWY1nzR57c9zqRj9Jjj0 Jk6kS9bAtCR5Tz77+511kUlKRV8y5J7tT/lAqCbA= From: Lakshmi Ramasubramanian To: =zohar@linux.ibm.com, James.Bottomley@HansenPartnership.com, linux-integrity@vger.kernel.org Cc: dhowells@redhat.com, arnd@arndb.de, matthewgarrett@google.com, sashal@kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org Subject: [PATCH v8 2/3] IMA: Call workqueue functions to measure queued keys Date: Wed, 8 Jan 2020 18:42:15 -0800 Message-Id: <20200109024216.3350-3-nramas@linux.microsoft.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200109024216.3350-1-nramas@linux.microsoft.com> References: <20200109024216.3350-1-nramas@linux.microsoft.com> Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Measuring keys requires a custom IMA policy to be loaded. Keys should be queued for measurement if a custom IMA policy is not yet loaded. Keys queued for measurement, if any, should be processed when a custom IMA policy is loaded. This patch updates the IMA hook function ima_post_key_create_or_update() to queue the key if a custom IMA policy has not yet been loaded. And, ima_update_policy() function, which is called when a custom IMA policy is loaded, is updated to process queued keys. Signed-off-by: Lakshmi Ramasubramanian --- security/integrity/ima/ima_asymmetric_keys.c | 8 ++++++++ security/integrity/ima/ima_policy.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/security/integrity/ima/ima_asymmetric_keys.c b/security/integrity/ima/ima_asymmetric_keys.c index 1d56f003f1a7..eb71cbf224c1 100644 --- a/security/integrity/ima/ima_asymmetric_keys.c +++ b/security/integrity/ima/ima_asymmetric_keys.c @@ -145,6 +145,8 @@ void ima_post_key_create_or_update(struct key *keyring, struct key *key, const void *payload, size_t payload_len, unsigned long flags, bool create) { + bool queued = false; + /* Only asymmetric keys are handled by this hook. */ if (key->type != &key_type_asymmetric) return; @@ -152,6 +154,12 @@ void ima_post_key_create_or_update(struct key *keyring, struct key *key, if (!payload || (payload_len == 0)) return; + if (!ima_process_keys) + queued = ima_queue_key(keyring, payload, payload_len); + + if (queued) + return; + /* * keyring->description points to the name of the keyring * (such as ".builtin_trusted_keys", ".ima", etc.) to diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 8f2ca487753b..1bdda05d963b 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -807,6 +807,9 @@ void ima_update_policy(void) kfree(arch_policy_entry); } ima_update_policy_flag(); + + /* Custom IMA policy has been loaded */ + ima_process_queued_keys(); } /* Keep the enumeration in sync with the policy_tokens! */ From patchwork Thu Jan 9 02:42:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lakshmi Ramasubramanian X-Patchwork-Id: 11324999 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E9E69138C for ; Thu, 9 Jan 2020 02:42:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C790720848 for ; Thu, 9 Jan 2020 02:42:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="JJeIHSBx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726758AbgAICm2 (ORCPT ); Wed, 8 Jan 2020 21:42:28 -0500 Received: from linux.microsoft.com ([13.77.154.182]:54366 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727797AbgAICmW (ORCPT ); Wed, 8 Jan 2020 21:42:22 -0500 Received: from nramas-ThinkStation-P520.corp.microsoft.com (unknown [131.107.174.108]) by linux.microsoft.com (Postfix) with ESMTPSA id 344A92007690; Wed, 8 Jan 2020 18:42:21 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 344A92007690 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1578537741; bh=59YyHVNcW/QdFRQ8i/3QqqsbF0Ns+ie/nKbZAKZnaZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JJeIHSBxjoC1NeR7xwKUqtKfhljHY+vcwqID57OBG714diiz1lVr3N26RNgjdhtoK taZxYM8rs4xGUTgQ24tQ7hcWlPLhBWp/CDQZoMiBGaR3yej2nOySy6nhMcXimx/q63 LFPtcrWuJRCQjRfejdu9jRw3C4IPfDRUMxb4jO3w= From: Lakshmi Ramasubramanian To: =zohar@linux.ibm.com, James.Bottomley@HansenPartnership.com, linux-integrity@vger.kernel.org Cc: dhowells@redhat.com, arnd@arndb.de, matthewgarrett@google.com, sashal@kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org Subject: [PATCH v8 3/3] IMA: Defined timer to free queued keys Date: Wed, 8 Jan 2020 18:42:16 -0800 Message-Id: <20200109024216.3350-4-nramas@linux.microsoft.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200109024216.3350-1-nramas@linux.microsoft.com> References: <20200109024216.3350-1-nramas@linux.microsoft.com> Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org keys queued for measurement should be freed if a custom IMA policy was not loaded. Otherwise, the keys will remain queued forever consuming kernel memory. This patch defines a timer to handle the above scenario. The timer is setup to expire 5 minutes after IMA initialization is completed. If a custom IMA policy is loaded before the timer expires, the timer is removed and any queued keys are processed for measurement. But if a custom policy was not loaded, on timer expiration queued keys are just freed. Signed-off-by: Lakshmi Ramasubramanian Reported-by: kernel test robot # sleeping function called from invalid context Reported-by: kbuild test robot # redefinition of ima_init_key_queue() function. --- security/integrity/ima/ima.h | 2 + security/integrity/ima/ima_asymmetric_keys.c | 42 ++++++++++++++++++-- security/integrity/ima/ima_init.c | 8 +++- 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index c7fdf3d66b98..6bb3152b3e24 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -216,8 +216,10 @@ struct ima_key_entry { char *keyring_name; }; void ima_process_queued_keys(void); +void ima_init_key_queue(void); #else static inline void ima_process_queued_keys(void) {} +static inline void ima_init_key_queue(void) {} #endif /* CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS */ /* LIM API function definitions */ diff --git a/security/integrity/ima/ima_asymmetric_keys.c b/security/integrity/ima/ima_asymmetric_keys.c index eb71cbf224c1..d1fa1706e03f 100644 --- a/security/integrity/ima/ima_asymmetric_keys.c +++ b/security/integrity/ima/ima_asymmetric_keys.c @@ -11,6 +11,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include #include #include "ima.h" @@ -26,6 +27,36 @@ static bool ima_process_keys; static DEFINE_SPINLOCK(ima_keys_lock); static LIST_HEAD(ima_keys); +/* + * If custom IMA policy is not loaded then keys queued up + * for measurement should be freed. This timer is used + * for handling this scenario. + */ +static long ima_key_queue_timeout = 300000; /* 5 Minutes */ +static struct timer_list ima_key_queue_timer; +static bool timer_expired; + +/* + * This timer callback function frees keys that may still be + * queued up in case custom IMA policy was not loaded. + */ +static void ima_timer_handler(struct timer_list *timer) +{ + timer_expired = true; + ima_process_queued_keys(); +} + +/* + * This function sets up a timer to free queued keys in case + * custom IMA policy was never loaded. + */ +void ima_init_key_queue(void) +{ + timer_setup(&ima_key_queue_timer, ima_timer_handler, 0); + mod_timer(&ima_key_queue_timer, + jiffies + msecs_to_jiffies(ima_key_queue_timeout)); +} + static void ima_free_key_entry(struct ima_key_entry *entry) { if (entry) { @@ -120,10 +151,15 @@ void ima_process_queued_keys(void) if (!process) return; + del_timer(&ima_key_queue_timer); + list_for_each_entry_safe(entry, tmp, &ima_keys, list) { - process_buffer_measurement(entry->payload, entry->payload_len, - entry->keyring_name, KEY_CHECK, 0, - entry->keyring_name); + if (!timer_expired) + process_buffer_measurement(entry->payload, + entry->payload_len, + entry->keyring_name, + KEY_CHECK, 0, + entry->keyring_name); list_del(&entry->list); ima_free_key_entry(entry); } diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c index 5d55ade5f3b9..195cb4079b2b 100644 --- a/security/integrity/ima/ima_init.c +++ b/security/integrity/ima/ima_init.c @@ -131,5 +131,11 @@ int __init ima_init(void) ima_init_policy(); - return ima_fs_init(); + rc = ima_fs_init(); + if (rc != 0) + return rc; + + ima_init_key_queue(); + + return rc; }