From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 48AF1C76186 for ; Wed, 24 Jul 2019 19:48:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D656217D4 for ; Wed, 24 Jul 2019 19:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997681; bh=JqlQr2l/NC3g9u4XIP2XaATPhIAheQqA+OSuoR21RHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=J2GEcR3M4bnILCtbnCz3lPlPSaVQ36vyycuXjEJifjmJDlFkr+fZqg8x8RC2Y1/13 L6QE6/On4jr90C6qu7jLUYguV7pKOOS7d2Hqot4Yz2Qe4QbbXBr/qD5U8Yzp6dqv5f bjROAmb5alUraqJMb90maTctPFF4ZPb1QS4qNtpM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391343AbfGXTsA (ORCPT ); Wed, 24 Jul 2019 15:48:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:54896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728309AbfGXTr5 (ORCPT ); Wed, 24 Jul 2019 15:47:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2599620659; Wed, 24 Jul 2019 19:47:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997676; bh=JqlQr2l/NC3g9u4XIP2XaATPhIAheQqA+OSuoR21RHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=za3pgoDhZOq8kzYvmbfzkzk1j2aIO0Xikh1oOZ4OWAPtht7N4c3jPRcrEu33VS9gC jNWNTZqycy+cz6YSQqD9otitRuUhfn/4lr6k9c1/UlQK3KkzHMEesrlqvRDaPcF5L+ Jh2iD+rIPOUCz4DvFanDmdHaEKOzw9g8FxMUfS0s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Nayna Jain , James Morris , Mimi Zohar , Sasha Levin Subject: [PATCH 5.1 104/371] integrity: Fix __integrity_init_keyring() section mismatch Date: Wed, 24 Jul 2019 21:17:36 +0200 Message-Id: <20190724191732.676878464@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 8c655784e2cf59cb6140759b8b546d98261d1ad9 ] With gcc-4.6.3: WARNING: vmlinux.o(.text.unlikely+0x24c64): Section mismatch in reference from the function __integrity_init_keyring() to the function .init.text:set_platform_trusted_keys() The function __integrity_init_keyring() references the function __init set_platform_trusted_keys(). This is often because __integrity_init_keyring lacks a __init annotation or the annotation of set_platform_trusted_keys is wrong. Indeed, if the compiler decides not to inline __integrity_init_keyring(), a warning is issued. Fix this by adding the missing __init annotation. Fixes: 9dc92c45177ab70e ("integrity: Define a trusted platform keyring") Signed-off-by: Geert Uytterhoeven Reviewed-by: Nayna Jain Reviewed-by: James Morris Signed-off-by: Mimi Zohar Signed-off-by: Sasha Levin --- security/integrity/digsig.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c index e19c2eb72c51..37869214c243 100644 --- a/security/integrity/digsig.c +++ b/security/integrity/digsig.c @@ -73,8 +73,9 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, return -EOPNOTSUPP; } -static int __integrity_init_keyring(const unsigned int id, key_perm_t perm, - struct key_restriction *restriction) +static int __init __integrity_init_keyring(const unsigned int id, + key_perm_t perm, + struct key_restriction *restriction) { const struct cred *cred = current_cred(); int err = 0; -- 2.20.1