From patchwork Mon Jan 2 07:23:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 38014 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4051936wrt; Sun, 1 Jan 2023 23:30:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXufoEIGQdkHbcB/jUsG73Gw7FshllcSc4W45RXtqU/53BxZajmWATLSpQ3p8m8TKZFw5Jja X-Received: by 2002:a17:90a:fa2:b0:226:e83:659d with SMTP id 31-20020a17090a0fa200b002260e83659dmr20984153pjz.47.1672644650377; Sun, 01 Jan 2023 23:30:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672644650; cv=none; d=google.com; s=arc-20160816; b=D7O1XClDCfWV2vqQicY2stX42+d7uje5Bmw6sCSGaK3UacOO7TBDEuR351/qsmVo16 7iZUM85dWBCVJjIXwH+71ylD/zEn+w8RKJ9hsmzuODgu6PSr84Dloe7nvdIEg3VJUX1F cTsVYdh651tMPY2W8Y3Xxrd5MvAB2LcSYCSuurHqAVSt7iQMbdPkO4UPebJnfHFU/bx6 0SFZWHOebmvgj3np7FclT9tfEZfUuw3lpSTvNeKqrumejcgdZ2EGnv/byHxe7mlhwjH2 p0CkFZU88rNR/1DH9EJ2bnA+z5K1qCnVMjyz1Dxkk23iPiOm11rb4829DbQ3dYyNuF5N 3jfg== 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:dkim-signature; bh=uZkv46Z2Bqul59SdbhSz2/0kEiRL342ph/AKAU95GtQ=; b=NCEAjkXNl1RE/TI0Xh8bVtOEHZ6dnfMdr+bcstsksaMdgj05rdABhawAvskA1vqfdY /kwx17I1RNQ8WC29HP458SZCg5IE2VGfmUFsCRg2yjfoETzBUy6bsz40ePfG9NwYRWrf nu9A3pqXp1fEvOUwQX8lPY7tKJp12uD8l2MtVzxeeOev3vOtrnorSlSp2fgthZ/CIlcq X71gxJUCDSMnzvH9xYUG1gNrp5jlZPVGk5j/ysrIv1NnzpEnby0bE6sQXLBn+07sgqjI HRv+wVDM1rWh/k3LhD8AwJQjz80AdYabknrG7dKtZR6PKFYzxOps5ox/yUjpkZ6Lns+u GdeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=ejVdKsdm; 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 nd10-20020a17090b4cca00b0021409b2423esi32267534pjb.86.2023.01.01.23.30.34; Sun, 01 Jan 2023 23:30:50 -0800 (PST) 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; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=ejVdKsdm; 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 S229941AbjABHXx (ORCPT + 99 others); Mon, 2 Jan 2023 02:23:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229447AbjABHXv (ORCPT ); Mon, 2 Jan 2023 02:23:51 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8E9AE4A; Sun, 1 Jan 2023 23:23:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=uZkv46Z2Bqul59SdbhSz2/0kEiRL342ph/AKAU95GtQ=; b=ejVdKsdmRXa0S1PM+BSiBL1+G6 Byu9a2nWdrSFKmSUZy4zFSwoknPjjH9BEDLtNzXElNS/p69cB+wONw2m6SEhNp2wQo+LH5e/9tz0e yJUJ38FVa3EdCupexLXILN1bQC49FVfP2nZ8RK6PGiNHwKUzTKL/eTamh8LNVIjnZ2xOobz2PaZJf 7dGpbjIweoqNur9njT8IH+FsX9cjqs1R9WgaTEeC6b8xlEe8OCWfViFa0xJu1YaOrjpjwfLNXXln/ wtDUpjGbEDHwZsyVn8L3M0aeuUUqWTHddO/nBhShSPuNV9wfAAymgACPzTzY5b2DUNfXgngkT82K9 ylzy6qdw==; Received: from [2601:1c2:d80:3110::a2e7] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCFAj-009Cjs-4J; Mon, 02 Jan 2023 07:23:49 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , David Howells , David Woodhouse , keyrings@vger.kernel.org Subject: [PATCH] certs: system_keyring: fix kernel-doc warnings Date: Sun, 1 Jan 2023 23:23:48 -0800 Message-Id: <20230102072348.26425-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753895036883549786?= X-GMAIL-MSGID: =?utf-8?q?1753895036883549786?= Fix W=1 kernel-doc warnings: certs/system_keyring.c:45: warning: expecting prototype for restrict_link_to_builtin_trusted(). Prototype was for restrict_link_by_builtin_trusted() instead certs/system_keyring.c:79: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst * Allocate a struct key_restriction for the "builtin and secondary trust" Signed-off-by: Randy Dunlap Cc: David Howells Cc: David Woodhouse Cc: keyrings@vger.kernel.org --- certs/system_keyring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -- a/certs/system_keyring.c b/certs/system_keyring.c --- a/certs/system_keyring.c +++ b/certs/system_keyring.c @@ -33,7 +33,7 @@ extern __initconst const unsigned long s extern __initconst const unsigned long module_cert_size; /** - * restrict_link_to_builtin_trusted - Restrict keyring addition by built in CA + * restrict_link_by_builtin_trusted - Restrict keyring addition by built in CA * * Restrict the addition of keys into a keyring based on the key-to-be-added * being vouched for by a key in the built in system keyring. @@ -75,7 +75,7 @@ int restrict_link_by_builtin_and_seconda secondary_trusted_keys); } -/** +/* * Allocate a struct key_restriction for the "builtin and secondary trust" * keyring. Only for use in system_trusted_keyring_init(). */