From patchwork Tue Jun 6 07:41:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roberto Sassu X-Patchwork-Id: 103615 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3217984vqr; Tue, 6 Jun 2023 00:51:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7MoDdsc5BVSNlIyxS73Yc49ZOdy1T1CdrgyH39YYcX5pnnOhWIjJs+q3Zxby59puN9Dd5C X-Received: by 2002:a17:902:ecc2:b0:1b0:42d1:ecd0 with SMTP id a2-20020a170902ecc200b001b042d1ecd0mr1791676plh.66.1686037908995; Tue, 06 Jun 2023 00:51:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686037908; cv=none; d=google.com; s=arc-20160816; b=cFVC3QkMkN9ekEAc1MFNWYCGx7H8AvOOCX197TxE/k+jm6mGY4ywjCf07RFLUoBj5I VRYCAZQsb8kHTGvgz7fyP73jxBtgRS9rrbDKI+vbr+vND+89iTxY7dzAB1dcw0HYaLXd nzagfm/4bpVftOLABkgX1Alt2cjeG4ORHVfn5EQTXdJjTtC5k++Th4nSM9a7Wq61ddDe mfDN4qdmFa+e35Awe5f9ydRblx0MJ6xH98BpTWFemeBTQryFO9TBrgahQBgNPWZYNvdP N65L71oUhkPhcNjYB++TuZx80YOPqmOx3llZqiyumzNX9hTqMObadJ7CVSSuzFyxsDMN QJlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=VD3/4ZXp2nHFgaBe/tMAkDPOwj2nyOVG0HX0qTkjpbU=; b=yaccBM1B9FBBSAHxG6ItUrEMcDjVyMyM1XHyjNzokDHNgcVrTaiSlKWYKDdchsSqnB 58RBt48FXRklDDRsrSR12MCyUGQRUGezRzyt26oDg66fW62DaksDntS17uHXjbHr1RYj /0vlPbxTmr6lmec1wWAuaFvPtphqTsmITLWo9lC+rosDz8Ls5lFoyzaFrOGKyzl83ow/ ky92BL4FnIzC4cwyU7qraRzsi75d3DlaNDNjZmK1QRNkYw0cD/lV654ROzloRCzMDTox s1082BCn+frFs5AhYRBvZ9C82j4FU84NBQt5SC+JnwKKOsDld/7Zx3UPYWwPbVpmeydQ 2y7w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h7-20020a170902ac8700b00198ff2d6543si6761552plr.117.2023.06.06.00.51.35; Tue, 06 Jun 2023 00:51:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236255AbjFFHqU (ORCPT + 99 others); Tue, 6 Jun 2023 03:46:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236529AbjFFHo0 (ORCPT ); Tue, 6 Jun 2023 03:44:26 -0400 Received: from frasgout13.his.huawei.com (unknown [14.137.139.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10C7710FD; Tue, 6 Jun 2023 00:41:53 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.18.147.228]) by frasgout13.his.huawei.com (SkyGuard) with ESMTP id 4Qb2G93sy9zB0trs; Tue, 6 Jun 2023 15:31:13 +0800 (CST) Received: from huaweicloud.com (unknown [10.204.63.22]) by APP2 (Coremail) with SMTP id GxC2BwDnkzof435kO04NAw--.3705S2; Tue, 06 Jun 2023 08:41:25 +0100 (CET) From: Roberto Sassu To: zohar@linux.ibm.com, dmitry.kasatkin@gmail.com, paul@paul-moore.com, jmorris@namei.org, serge@hallyn.com Cc: linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Roberto Sassu Subject: [PATCH 1/2] evm: Fix build warnings Date: Tue, 6 Jun 2023 09:41:12 +0200 Message-Id: <20230606074113.2120632-1-roberto.sassu@huaweicloud.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: GxC2BwDnkzof435kO04NAw--.3705S2 X-Coremail-Antispam: 1UD129KBjvJXoW7KFy7Aw1fGF17Zw17uryUZFb_yoW8tw4xpa 15KFW8Jr4kGFyUCrykAF4rCa4F9rWjgw1jgwsrAr1vvF98ZrWkXr1Ikr4jgr95Kryxtrn2 yayYvrn5Zwn0y3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUk0b4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIEc7CjxV AFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG 6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFV Cjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkF7I0En4kS14v26r4a6rW5MxAIw28IcxkI 7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxV Cjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY 6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6x AIw20EY4v20xvaj40_Zr0_Wr1UMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIE c7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxU4NB_UUUUU X-CM-SenderInfo: purev21wro2thvvxqx5xdzvxpfor3voofrz/1tbiAQAABF1jj45CQAACs6 X-CFilter-Loop: Reflected X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, PDS_RDNS_DYNAMIC_FP,RCVD_IN_MSPIKE_BL,RCVD_IN_MSPIKE_L3,RDNS_DYNAMIC, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767938886169775994?= X-GMAIL-MSGID: =?utf-8?q?1767938886169775994?= From: Roberto Sassu Fix build warnings (function parameters description) for evm_read_protected_xattrs(), evm_set_key() and evm_verifyxattr(). Fixes: 7626676320f3 ("evm: provide a function to set the EVM key from the kernel") Fixes: 8314b6732ae4 ("ima: Define new template fields xattrnames, xattrlengths and xattrvalues") Fixes: 2960e6cb5f7c ("evm: additional parameter to pass integrity cache entry 'iint'") Signed-off-by: Roberto Sassu --- security/integrity/evm/evm_crypto.c | 2 +- security/integrity/evm/evm_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c index 033804f5a5f..0dae649f374 100644 --- a/security/integrity/evm/evm_crypto.c +++ b/security/integrity/evm/evm_crypto.c @@ -40,7 +40,7 @@ static const char evm_hmac[] = "hmac(sha1)"; /** * evm_set_key() - set EVM HMAC key from the kernel * @key: pointer to a buffer with the key data - * @size: length of the key data + * @keylen: length of the key data * * This function allows setting the EVM HMAC key from the kernel * without using the "encrypted" key subsystem keys. It can be used diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index b1c2197473a..c9b6e2a4347 100644 --- a/security/integrity/evm/evm_main.c +++ b/security/integrity/evm/evm_main.c @@ -318,7 +318,6 @@ int evm_protected_xattr_if_enabled(const char *req_xattr_name) /** * evm_read_protected_xattrs - read EVM protected xattr names, lengths, values * @dentry: dentry of the read xattrs - * @inode: inode of the read xattrs * @buffer: buffer xattr names, lengths or values are copied to * @buffer_size: size of buffer * @type: n: names, l: lengths, v: values @@ -390,6 +389,7 @@ int evm_read_protected_xattrs(struct dentry *dentry, u8 *buffer, * @xattr_name: requested xattr * @xattr_value: requested xattr value * @xattr_value_len: requested xattr value length + * @iint: inode integrity metadata * * Calculate the HMAC for the given dentry and verify it against the stored * security.evm xattr. For performance, use the xattr value and length