From patchwork Mon Oct 23 01:11:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Li X-Patchwork-Id: 156622 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1015955vqx; Sun, 22 Oct 2023 18:11:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESomp7SVXo9xKQmpb3h2iR5bRQeUGNBDt5PK3c6ctfgBZGXj6Qb+FzyI0w2FVy9+TQg0L6 X-Received: by 2002:a05:6358:5d91:b0:168:e493:2938 with SMTP id s17-20020a0563585d9100b00168e4932938mr451881rwm.19.1698023512699; Sun, 22 Oct 2023 18:11:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698023512; cv=none; d=google.com; s=arc-20160816; b=AHIAxeQBEzSkixhfrWGyzfXG+Qr7M14uLXeyah0azEwf/CbrjizbQ+SnCVbbPKjtuw AJz4uenaQLIbsX5GEAYN2uwPx4YPYaDxQBKuwWiscVSeWpeHvYY+jJ+DEo/S1cuDxlFY 57jSqySKEneL1Mdtp+W0SKlYKANBacaBeo0PN8s6lBBryFaoFhSnJ8U7UZ46z6yegIen d9ODEYJdN/CcPkU3MIvdd8JP8AZminvGz8itrW4Arfp1shqPuLGXiSimm3Ssdxv7EHGu 2yzGGjvJrQ1LzgS+nDNFyk+0j5027B8HNHl6uyTWme4hEKGX/yFf4YzdP2g59YGHilqw ce3Q== 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=dTqwQ2zTYDcHO1OsXnPl0NDL3VTqDF1eKatC+SyU0DU=; fh=CsrrSYuaOy6XOars/dGdvSnPykGebxMPWt+wbxMWbTM=; b=OM3OZRK5247qXDVnTMTdQWhJ7ZiROBKGMw2myMiKOUYjQdJk+QpH2Jvy4SOJ8wytE6 a3qQ/31DxYQLD6elMREbGgEXz2/gH/MhEKJg5STqBFPD6EX9mIcw/7UOrJ+bBhQH5GFD QXXOfv+Vhfl8qcYOSJTbXUR0fuQIaIxZ53HC4QhUe1KkdTsuijhIX9IK7DqCMfAe3jIi eI+rJ+luzb2LZhLmD+IgKhU9CIg0EDeumsCmxm8TC1ZPbY6sl9Hb/LFJrvi8Uwar85UZ Sb5ZoI41RY9pODOzVvXeVRvTU1aNbrSEDIZ+Dx8IBiUO67BASO/JqB8P7511zu/ympPs 6c9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id cb17-20020a056a02071100b00578f1ab2287si5737727pgb.354.2023.10.22.18.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 18:11:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 4B6D6807DED6; Sun, 22 Oct 2023 18:11:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232971AbjJWBLe (ORCPT + 26 others); Sun, 22 Oct 2023 21:11:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbjJWBLc (ORCPT ); Sun, 22 Oct 2023 21:11:32 -0400 Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0EB9F1; Sun, 22 Oct 2023 18:11:29 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=yang.lee@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0Vucq0a7_1698023486; Received: from localhost(mailfrom:yang.lee@linux.alibaba.com fp:SMTPD_---0Vucq0a7_1698023486) by smtp.aliyun-inc.com; Mon, 23 Oct 2023 09:11:26 +0800 From: Yang Li To: john.johansen@canonical.com, paul@paul-moore.com, jmorris@namei.org, serge@hallyn.com Cc: apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Li , Abaci Robot Subject: [PATCH -next 1/2] apparmor: Fix one kernel-doc comment Date: Mon, 23 Oct 2023 09:11:23 +0800 Message-Id: <20231023011124.19034-1-yang.lee@linux.alibaba.com> X-Mailer: git-send-email 2.20.1.7.g153144c MIME-Version: 1.0 X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 22 Oct 2023 18:11:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780506702948463666 X-GMAIL-MSGID: 1780506702948463666 Fix one kernel-doc comment to silence the warnings: security/apparmor/domain.c:46: warning: Function parameter or member 'to_cred' not described in 'may_change_ptraced_domain' security/apparmor/domain.c:46: warning: Excess function parameter 'cred' description in 'may_change_ptraced_domain' Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7036 Signed-off-by: Yang Li --- security/apparmor/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index ed4a13d44894..89fbeab4b33b 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c @@ -31,7 +31,7 @@ /** * may_change_ptraced_domain - check if can change profile on ptraced task - * @cred: cred of task changing domain + * @to_cred: cred of task changing domain * @to_label: profile to change to (NOT NULL) * @info: message if there is an error * From patchwork Mon Oct 23 01:11:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Li X-Patchwork-Id: 156623 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1015977vqx; Sun, 22 Oct 2023 18:11:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHY1iXIxEzZn22h6KjnXp/hIsDO8XNogUAiaS+oZGTtdOa2MF6xpUtPCKHqs7kLJig/CGUO X-Received: by 2002:a05:6a00:17a1:b0:6b2:baa0:6d4c with SMTP id s33-20020a056a0017a100b006b2baa06d4cmr6165865pfg.33.1698023515105; Sun, 22 Oct 2023 18:11:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698023515; cv=none; d=google.com; s=arc-20160816; b=wNelm2TgzU3G3+8keInIkjXfQJBinCU+820DZ45ITXYLa92ShyFK/MC5mEJ+Z3oiZC IzJeGsI5JwQ9zrVFnasw3DZ/YIjYDoA0AiTbuNeFGPveUCeEM/Rm8eNVn7aV1KR2VUy/ 502L2PtXBdaEFVxX4WoUhUbRXKWCINtGTw5KksL17EI7ymcnri34y3Pf7fSHR4VgH9zj T+J9+H05LSYF1bKT5Ubk8J31Xm1MtGdlb8m6bl0/+ploaZHcNFeC/R6hQ68sB9l5l4vL G3e3t5Gi90/eoz/ZKpwT4WmPFDtBF3ItkVXTkrV/2b3NQO6e9SYrh6NM0xO9oSYe9BoZ hIRA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=IAxOlcwRqFja+TOdqhn1u61E28quyDBEDIb2nRM9OUw=; fh=CsrrSYuaOy6XOars/dGdvSnPykGebxMPWt+wbxMWbTM=; b=qciySiq8pWjiOM2lEeuZrIJhQCJ547eITS0mgjXtokoc2FF8gic2ZNo3tddLql0/ZB dFKklDEYzp9Xb5VaK+gMN5lmUq5ZYGBHItuD5MY3gj0QUDYhtm5dTTikxwMf3l6PuMIk EliqFHNmckCmAY7c3VyVgFk+iOBX0qbDFvKK7XVlkyCXnn787lhuGAq/amn88IWpmfOh CjJwB5sHjVkgkAbGyRbNGQPB9G1TvmOc2yQpk4rvbDZKoqUCHGGZ11TlSNUw8q1J26+R qjktx0JgPHn/8IkAgIk6Fu0FT4TnztwWMPEOYqnDVUwHikWOmkowOWISxh/nS/x5tOQd msuQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id b5-20020a056a000cc500b00690a7aefa50si5637584pfv.325.2023.10.22.18.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 18:11:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id CC81C806BC1C; Sun, 22 Oct 2023 18:11:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232987AbjJWBLi (ORCPT + 26 others); Sun, 22 Oct 2023 21:11:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232970AbjJWBLe (ORCPT ); Sun, 22 Oct 2023 21:11:34 -0400 Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD0C6ED; Sun, 22 Oct 2023 18:11:31 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R291e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046051;MF=yang.lee@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0Vucq0b9_1698023488; Received: from localhost(mailfrom:yang.lee@linux.alibaba.com fp:SMTPD_---0Vucq0b9_1698023488) by smtp.aliyun-inc.com; Mon, 23 Oct 2023 09:11:28 +0800 From: Yang Li To: john.johansen@canonical.com, paul@paul-moore.com, jmorris@namei.org, serge@hallyn.com Cc: apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Li , Abaci Robot Subject: [PATCH -next 2/2] apparmor: Fix some kernel-doc comments Date: Mon, 23 Oct 2023 09:11:24 +0800 Message-Id: <20231023011124.19034-2-yang.lee@linux.alibaba.com> X-Mailer: git-send-email 2.20.1.7.g153144c In-Reply-To: <20231023011124.19034-1-yang.lee@linux.alibaba.com> References: <20231023011124.19034-1-yang.lee@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sun, 22 Oct 2023 18:11:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780506705391317626 X-GMAIL-MSGID: 1780506705391317626 Fix some kernel-doc comments to silence the warnings: security/apparmor/policy.c:117: warning: Function parameter or member 'kref' not described in 'aa_pdb_free_kref' security/apparmor/policy.c:117: warning: Excess function parameter 'kr' description in 'aa_pdb_free_kref' security/apparmor/policy.c:882: warning: Function parameter or member 'subj_cred' not described in 'aa_may_manage_policy' Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7037 Signed-off-by: Yang Li --- security/apparmor/policy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c index a441d96adcbf..ed4c9803c8fa 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c @@ -111,7 +111,7 @@ static void aa_free_pdb(struct aa_policydb *policy) /** * aa_pdb_free_kref - free aa_policydb by kref (called by aa_put_pdb) - * @kr: kref callback for freeing of a dfa (NOT NULL) + * @kref: kref callback for freeing of a dfa (NOT NULL) */ void aa_pdb_free_kref(struct kref *kref) { @@ -870,7 +870,7 @@ bool aa_current_policy_admin_capable(struct aa_ns *ns) /** * aa_may_manage_policy - can the current task manage policy - * @subj_cred; subjects cred + * @subj_cred: subjects cred * @label: label to check if it can manage policy * @ns: namespace being managed by @label (may be NULL if @label's ns) * @mask: contains the policy manipulation operation being done