Received: by 2002:a05:6358:bb9e:b0:b9:5105:a5b4 with SMTP id df30csp2842417rwb; Mon, 5 Sep 2022 02:20:42 -0700 (PDT) X-Google-Smtp-Source: AA6agR5FAL3gvNyPiHr7h0qDeHOD/poJdiozhcGNO/rX0GBixYkTi4Fh/YQAvJxhtdOYlxPF17yC X-Received: by 2002:a63:8642:0:b0:42b:7f8e:415c with SMTP id x63-20020a638642000000b0042b7f8e415cmr38790532pgd.203.1662369642099; Mon, 05 Sep 2022 02:20:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662369642; cv=none; d=google.com; s=arc-20160816; b=M+QhD4mJBpDgr0Gd5ijbtRAn18zVKUyiTFIsKhRB7xh+unGdv7GsFAu6W4OSFH6RDz 5hroRiTVEBisUA/6ycLfM3RJYOlJRJ99kjFa+YhXWb+/a+SVH5eXfLnHEwaSeEyjnvPO fdDgZTOxZ3hWMi8sFwdb982b9daYkOJqelczTlEaGUIJQEPQnRqWOV9P/trW6yofF9aH WZszGMXlnfqEd12zvYTRQ6KKSJ66kTOolI2bu7L7eGyhfOm7G074Ddz+ftXxva+mXWX5 I3+kfIPidzVtwPcHZ++rxqUXnD71SzAOw+NFemnudi+9sj8Ggt8ViIgZ3MxVuVE5zfpS pjBQ== 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=FtflAV4XyAhg5qSVGqIFoL6MH4mdvQtkWyE7Fy6ZkFU=; b=AdOwr6I9Sdg8Pe700xeBizPOSAQItw504hqSyg51YMdsKsxq5lDlT/+hKQKnSR6ve/ odZv/u9Hw6ad9tBAwiCNDqDvQTsxEarAV+/qmnmFJLmJH8KVDV9wKCk78uvANzTUA+GQ vwF1a24AxS/eeoYLcYa/kJR7rOhiez4xBGBcY60khXDsaTiOo987S7/Quoi/yWapiriY 0ouSm7yl2zdvcCt6RqegVtNBfiJ77GgF59ZYNvNS/PMI5IjhyuqiynkS0LA99vvWCLjn W3pJ76gEWp5/6GgdHjgPNIRsbL5gXejUMZooRkPa13qSTjGFdUYKQZxK5SaredMKETrH P7YA== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f10-20020a170902860a00b00174cd29888bsi9230647plo.235.2022.09.05.02.20.29; Mon, 05 Sep 2022 02:20:42 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236806AbiIEIp4 (ORCPT + 99 others); Mon, 5 Sep 2022 04:45:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236812AbiIEIpy (ORCPT ); Mon, 5 Sep 2022 04:45:54 -0400 Received: from out30-44.freemail.mail.aliyun.com (out30-44.freemail.mail.aliyun.com [115.124.30.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8B024330D; Mon, 5 Sep 2022 01:45:51 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R521e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=yang.lee@linux.alibaba.com;NM=1;PH=DS;RN=10;SR=0;TI=SMTPD_---0VOP0IXE_1662367547; Received: from localhost(mailfrom:yang.lee@linux.alibaba.com fp:SMTPD_---0VOP0IXE_1662367547) by smtp.aliyun-inc.com; Mon, 05 Sep 2022 16:45:48 +0800 From: Yang Li To: zohar@linux.ibm.com Cc: dmitry.kasatkin@gmail.com, paul@paul-moore.com, jmorris@namei.org, serge@hallyn.com, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Li , Abaci Robot Subject: [PATCH -next] security: Fix some kernel-doc comments Date: Mon, 5 Sep 2022 16:45:46 +0800 Message-Id: <20220905084546.21692-1-yang.lee@linux.alibaba.com> X-Mailer: git-send-email 2.20.1.7.g153144c MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham 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 Fix some kernel-doc comments: 1.Remove the description of @inode in evm_read_protected_xattrs(); 2.Add the description of @iint in integrity_status(); 3.Add the description of @mnt_userns and @attr in evm_inode_setattr(). Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=2054 Reported-by: Abaci Robot Signed-off-by: Yang Li --- security/integrity/evm/evm_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index 23d484e05e6f..2172fe46e907 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: integrity data associated with an inode * * Calculate the HMAC for the given dentry and verify it against the stored * security.evm xattr. For performance, use the xattr value and length @@ -776,7 +776,9 @@ static int evm_attr_change(struct user_namespace *mnt_userns, /** * evm_inode_setattr - prevent updating an invalid EVM extended attribute + * @mnt_userns: user namespace of the idmapped mount * @dentry: pointer to the affected dentry + * @attr: new inode attributes * * Permit update of file attributes when files have a valid EVM signature, * except in the case of them having an immutable portable signature. -- 2.20.1.7.g153144c