From patchwork Wed Apr 21 16:19:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roberto Sassu X-Patchwork-Id: 12216475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 357FDC433B4 for ; Wed, 21 Apr 2021 16:20:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 049086144A for ; Wed, 21 Apr 2021 16:20:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244267AbhDUQUl (ORCPT ); Wed, 21 Apr 2021 12:20:41 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:2896 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244246AbhDUQUi (ORCPT ); Wed, 21 Apr 2021 12:20:38 -0400 Received: from fraeml714-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FQQYl0XrYz6slNm; Thu, 22 Apr 2021 00:12:27 +0800 (CST) Received: from roberto-ThinkStation-P620.huawei.com (10.204.62.217) by fraeml714-chm.china.huawei.com (10.206.15.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 21 Apr 2021 18:19:57 +0200 From: Roberto Sassu To: , , , CC: , , , , , Roberto Sassu Subject: [PATCH v2 0/6] evm: Prepare for moving to the LSM infrastructure Date: Wed, 21 Apr 2021 18:19:19 +0200 Message-ID: <20210421161925.968825-1-roberto.sassu@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.204.62.217] X-ClientProxiedBy: lhreml754-chm.china.huawei.com (10.201.108.204) To fraeml714-chm.china.huawei.com (10.206.15.33) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org This patch set depends on: https://lore.kernel.org/linux-integrity/20210409114313.4073-1-roberto.sassu@huawei.com/ https://lore.kernel.org/linux-integrity/20210407105252.30721-1-roberto.sassu@huawei.com/ One of the challenges that must be tackled to move IMA and EVM to the LSM infrastructure is to ensure that EVM is capable to correctly handle multiple stacked LSMs providing an xattr at file creation. At the moment, there are few issues that would prevent a correct integration. This patch set aims at solving them. From the LSM infrastructure side, the LSM stacking feature added the possibility of registering multiple implementations of the security hooks, that are called sequentially whenever someone calls the corresponding security hook. However, security_inode_init_security() and security_old_inode_init_security() are currently limited to support one xattr provided by LSM and one by EVM. In addition, using the call_int_hook() macro causes some issues. According to the documentation in include/linux/lsm_hooks.h, it is a legitimate case that an LSM returns -EOPNOTSUPP when it does not want to provide an xattr. However, the loop defined in the macro would stop calling subsequent LSMs if that happens. In the case of security_old_inode_init_security(), using the macro would also cause a memory leak due to replacing the *value pointer, if multiple LSMs provide an xattr. From EVM side, the first operation to be done is to change the definition of evm_inode_init_security() to be compatible with the security hook definition. Unfortunately, the current definition does not provide enough information for EVM, as it must have visibility of all xattrs provided by LSMs to correctly calculate the HMAC. This patch set changes the security hook definition by replacing the name, value and len triple with the xattr array allocated by security_inode_init_security(). Secondly, EVM must know how many elements are in the xattr array. It seems that it is not necessary to add another parameter, as all filesystems that define an initxattr function expect that the last element of the array is one with the name field set to NULL. EVM reuses the same assumption. This patch set has been tested by introducing several instances of a TestLSM (some providing an xattr, some not, one with a wrong implementation to see how the LSM infrastructure handles it). The patch is not included in this set but it is available here: https://github.com/robertosassu/linux/commit/dbe867fdf0b61b9bd73332f159e7ce5ca2a9b980 The test, added to ima-evm-utils, is available here: https://github.com/robertosassu/ima-evm-utils/blob/evm-multiple-lsms-v2-devel-v2/tests/evm_multiple_lsms.test The test takes a UML kernel built by Travis and launches it several times, each time with a different combination of LSMs. After boot, it first checks that there is an xattr for each LSM providing it, and then calculates the HMAC in user space and compares it with the HMAC calculated by EVM in kernel space. A test report can be obtained here: https://travis-ci.com/github/robertosassu/ima-evm-utils/jobs/500142666 SELinux Test Suite result (diff 5.11.14-200.fc33.x86_64 5.12.0-rc8+): -Files=70, Tests=1099, 82 wallclock secs ( 0.35 usr 0.09 sys + 7.39 cusr 10.14 csys = 17.97 CPU) +Files=70, Tests=1108, 104 wallclock secs ( 0.35 usr 0.09 sys + 7.35 cusr 11.35 csys = 19.14 CPU) Result: FAIL -Failed 2/70 test programs. 5/1099 subtests failed. +Failed 2/70 test programs. 5/1108 subtests failed. Smack Test Suite result: smack_set_ambient 1 TPASS: Test "smack_set_ambient" success. smack_set_current 1 TPASS: Test "smack_set_current" success. smack_set_doi 1 TPASS: Test "smack_set_doi" success. smack_set_netlabel 1 TPASS: Test "smack_set_netlabel" success. smack_set_socket_labels 1 TPASS : Test smack_set_socket_labels success. smack_set_cipso 1 TPASS: Test "smack_set_cipso" success. smack_set_direct 1 TPASS: Test "smack_set_direct" success. smack_set_load 1 TPASS: Test "smack_set_load" success. smack_set_onlycap 1 TFAIL: The smack label reported for "/smack/onlycap" Lastly, running the test on reiserfs to check security_old_inode_init_security(), some issues have been discovered: a free of xattr->name which is not correct after commit 9548906b2bb7 ('xattr: Constify ->name member of "struct xattr"'), missing calls to reiserfs_security_free() and a misalignment with security_inode_init_security() (the old version expects the full xattr name with the security. prefix, the new version just the suffix). The last issue has not been fixed yet. Changelog v1: - add calls to reiserfs_security_free() and initialize sec->value to NULL (suggested by Tetsuo and Mimi) - change definition of inode_init_security hook, replace the name, value and len triple with the xattr array (suggested by Casey) - introduce lsm_find_xattr_slot() helper for LSMs to find an unused slot in the passed xattr array Roberto Sassu (6): xattr: Complete constify ->name member of "struct xattr" reiserfs: Add missing calls to reiserfs_security_free() security: Pass xattrs allocated by LSMs to the inode_init_security hook security: Support multiple LSMs implementing the inode_init_security hook evm: Align evm_inode_init_security() definition with LSM infrastructure evm: Support multiple LSMs providing an xattr fs/reiserfs/namei.c | 4 ++ fs/reiserfs/xattr_security.c | 3 +- include/linux/evm.h | 17 +++-- include/linux/lsm_hook_defs.h | 4 +- include/linux/lsm_hooks.h | 22 ++++-- security/integrity/evm/evm.h | 2 + security/integrity/evm/evm_crypto.c | 9 ++- security/integrity/evm/evm_main.c | 28 +++++--- security/security.c | 105 +++++++++++++++++++++++----- security/selinux/hooks.c | 13 ++-- security/smack/smack_lsm.c | 20 +++--- 11 files changed, 167 insertions(+), 60 deletions(-)