From patchwork Wed Apr 4 12:30:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10322513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 374766053F for ; Wed, 4 Apr 2018 12:31:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B0B62874E for ; Wed, 4 Apr 2018 12:31:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FA5128E73; Wed, 4 Apr 2018 12:31:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 929BF2874E for ; Wed, 4 Apr 2018 12:31:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=2zxG1WwIb5qMyTHux8A0mB33wQCjx7wjpLWba5u5W5I=; b=M4N DlyJbisX33e9NkX7GwAqnZ0jO0s0fQdBHaABn+YGzejpTkTVJ5VLSwSga0olPXBA1of78HvpG5r2m nhL7zcenEqPFboiSYeuMiuA0wgeXN5Uygv1FzbH5slylxrsTtHUD58sFU8fdsGMoMBywukH5NpA6o yC0OLDOowDEj1t+G4t/3xcpipkQ16DpFG+5gsOj7rjErnae1BHCelRx9TsmBXgigtemtF9uViC7cp ExIabpXjVZHFkBpwuoRKmiCrD/Hx+LEvEgN1M8Akm7luTcM2hC/8fafIbf7fXh/iABVttS1KssqRV yGsghHYvgdOZuAszmyR9WBSXzJ9OE+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3hZi-00059i-Kc; Wed, 04 Apr 2018 12:31:38 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3hZc-00056s-JD for linux-arm-kernel@lists.infradead.org; Wed, 04 Apr 2018 12:31:35 +0000 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MTbSJ-1euaeH2GkJ-00SQlQ; Wed, 04 Apr 2018 14:31:18 +0200 From: Arnd Bergmann To: Russell King , Jinbum Park Subject: [PATCH] arm: decompressor: mark error() as __noreturn Date: Wed, 4 Apr 2018 14:30:50 +0200 Message-Id: <20180404123117.3575773-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:KQIJs5Cz/ZkMSEA+TmjjY3S+0OU/dzNTCnZAKHQWA1NyXMg+mTN dro8mQfrPVYkFWVVlRRocM+OZBP9RsrvnhEcH0saYRqi9Iqh17tgeq8/YgHG6mVxIrFape4 OHFrhIt9p1A64dBktG1XJtnsmFbS6TPtSV3RCmxKbpDXqr9+hEB8ZQzh+65pOQ5gE3h/2FN JrAQHiLFgFub3o7uU9OqQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:iTRZYIkqSzw=:PZdnCEYAxKtSGmgb/yEsjd DxBketQggQP69tF/2T5BjGWLPFwoOAxUiUuXpOMtO3vHx63YpGZVhReUw6o97Lx1kx1KBPFf1 FUshPbM1nqmzQpi3ur9NC9LsH3WlzyWm156GF/Kuz7PoWcnC7DGx2f3wh8DDi8qny9Xs90jH7 J33pi6hgWj+Bc/V3yF+tGrGU/HC21Zp/ru8UK0tZ0ADHcvoWmonjzRREFkKxxhVylWz07AXsR crMdcoBiIfTn8cUPLYAGHtSYxjXEY0EFz0pzoC/YVA0UNPNF3IKl04r97a2fv2r2DWM69eSTd 00zverlcx6c92HORKxtB+s11fLCst0dhEcGD913C2enpqRq3ZVa5XIKtiad+l4F5yqc8Heqyh WaOzEj2ftV0yZVNS+rN3suVB7FIb7f4XWpwBmm9D/3hz7P9/67EuGKKZmqjPfL8TZ5dhab0LY zYjCZmpQdo557SwsCDBIConznAC45un6YrJdRySIZ7oti9cOxFrbbY9Qp1E1jvkxxd+GU0U1B sBu6B0Hg5qqPvv4ya8d9wiFjcfAQ3QDFae8j2VYy9MiCC72+gbGYtkTmrXYz5eG34XbCYa03x Fpld96ICVaqbnfkvtr1tcGJYfbHV4kuvZSxM7cAndd4MnQSDxZQNjkmnOJOQF2f4/wRW+g+dW aynGZxvvei4UniyM7Lm0QfdpODnk9CsFDZp7vSBlDVHQ4lXZaA1/CyaFmgqyJhGYX0qtQv3ou NTwsp2DF9huG68NCbrEPoNHSnFfDhmfQ1zIo5A== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180404_053132_961558_491194DD X-CRM114-Status: GOOD ( 11.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Kees Cook , Arnd Bergmann , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP gcc complains about fortify_panic() possibly returning: arch/arm/boot/compressed/misc.c: In function 'fortify_panic': arch/arm/boot/compressed/misc.c:167:1: error: 'noreturn' function does return [-Werror] This annotates the error() function as __noreturn, which lets gcc see in all configurations that it fortify_panic() cannot return either. Fixes: ee333554fed5 ("ARM: 8749/1: Kconfig: Add ARCH_HAS_FORTIFY_SOURCE") Signed-off-by: Arnd Bergmann Acked-by: Kees Cook --- arch/arm/boot/compressed/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 009db7d275f8..313a587d656b 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -24,7 +24,7 @@ unsigned int __machine_arch_type; #include static void putstr(const char *ptr); -extern void error(char *x); +extern void error(char *x) __noreturn; #include CONFIG_UNCOMPRESS_INCLUDE