From patchwork Fri Jul 17 22:28: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: 11671281 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 5D5DC138C for ; Fri, 17 Jul 2020 22:28:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 436142074B for ; Fri, 17 Jul 2020 22:28:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="YVfP40hE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726784AbgGQW2Z (ORCPT ); Fri, 17 Jul 2020 18:28:25 -0400 Received: from linux.microsoft.com ([13.77.154.182]:46040 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726546AbgGQW2Z (ORCPT ); Fri, 17 Jul 2020 18:28:25 -0400 Received: from localhost.localdomain (c-73-42-176-67.hsd1.wa.comcast.net [73.42.176.67]) by linux.microsoft.com (Postfix) with ESMTPSA id BC35920B490C; Fri, 17 Jul 2020 15:28:24 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com BC35920B490C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1595024904; bh=uMfFSH8BKWRMGn0Ob/aAF/poLIpxKXFWWoJsEWCn7j0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YVfP40hEnxBsKkwDeaxnVTMhc7LN7IT8kG8YcZ+ZXHu9cM6KjnnrKLqydpNGLSBC/ 1WHUTzTnZdL7VM6F1hSZVAsjadaMffIan9wEG6BxnZbKwrwHfvHDSZBqcORhYY9OJC akYfBlGr526lVXP3W2Gz/Qnt67RIunVSwQzSGZvE= From: Lakshmi Ramasubramanian To: zohar@linux.ibm.com, stephen.smalley.work@gmail.com, casey@schaufler-ca.com Cc: jmorris@namei.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/5] IMA: Define an IMA hook to measure LSM data Date: Fri, 17 Jul 2020 15:28:16 -0700 Message-Id: <20200717222819.26198-3-nramas@linux.microsoft.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200717222819.26198-1-nramas@linux.microsoft.com> References: <20200717222819.26198-1-nramas@linux.microsoft.com> MIME-Version: 1.0 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org IMA subsystem needs to define an IMA hook that the security modules can call to measure critical data of the security modules. Define a new IMA hook, namely ima_lsm_state(), that the security modules can call to measure data. Signed-off-by: Lakshmi Ramasubramanian --- include/linux/ima.h | 4 ++++ security/integrity/ima/ima_main.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/linux/ima.h b/include/linux/ima.h index 9164e1534ec9..7e2686f4953a 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h @@ -26,6 +26,7 @@ extern int ima_post_read_file(struct file *file, void *buf, loff_t size, extern void ima_post_path_mknod(struct dentry *dentry); extern int ima_file_hash(struct file *file, char *buf, size_t buf_size); extern void ima_kexec_cmdline(const void *buf, int size); +extern void ima_lsm_state(const char *lsm_event_name, const void *buf, int size); #ifdef CONFIG_IMA_KEXEC extern void ima_add_kexec_buffer(struct kimage *image); @@ -104,6 +105,9 @@ static inline int ima_file_hash(struct file *file, char *buf, size_t buf_size) } static inline void ima_kexec_cmdline(const void *buf, int size) {} + +static inline void ima_lsm_state(const char *lsm_event_name, + const void *buf, int size) {} #endif /* CONFIG_IMA */ #ifndef CONFIG_IMA_KEXEC diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 8351b2fd48e0..04d9a1d35300 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -835,6 +835,23 @@ void ima_kexec_cmdline(const void *buf, int size) KEXEC_CMDLINE, 0, NULL); } +/** + * ima_lsm_state - measure LSM specific state + * @lsm_event_name: LSM event + * @buf: pointer to buffer containing LSM specific state + * @size: Number of bytes in buf + * + * Buffers can only be measured, not appraised. + */ +void ima_lsm_state(const char *lsm_event_name, const void *buf, int size) +{ + if (!lsm_event_name || !buf || !size) + return; + + process_buffer_measurement(buf, size, lsm_event_name, + LSM_STATE, 0, NULL); +} + static int __init init_ima(void) { int error;