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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 7BB8FC432C3 for ; Sat, 16 Nov 2019 15:45:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4808B2082E for ; Sat, 16 Nov 2019 15:45:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919148; bh=mVdXT8KgpU+9tvB2z5w+5sXBmDF6P0AEXBz5zUQsBtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ymZz8PLWR+Knib/HQbFaavDDHwp2Wl/fp1F1Kjx3b+Cm9dBcB4eYoU1ctoCOx7TGg QVy/XRumwLHjoz6qp0pOOZmlEBEimR76DiDhJzMt8HnwfJ7/vYC5gcJQou4pDHEfoK 3icTQc9rpNwDEC39hRrD5upx9N5x6rDMz8mSt9tc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729228AbfKPPpq (ORCPT ); Sat, 16 Nov 2019 10:45:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:51430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728405AbfKPPpn (ORCPT ); Sat, 16 Nov 2019 10:45:43 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E54382081E; Sat, 16 Nov 2019 15:45:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919143; bh=mVdXT8KgpU+9tvB2z5w+5sXBmDF6P0AEXBz5zUQsBtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xOd6vZzaot7kV0+pYAe51/ugYUGLWcWCS8xHnDjDbZ3zIYKZySIAcTRLxxoLF4pTA lDWc4R/kiRNhRgvuMrgx2lrmtkC9IHolhb4Xif6THmSqSQgydpdInVfBOXLEqqn+LE hJI1GAwWZhHffIj2xfGxggZ74kXOSS2cVlW/2mBY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Borislav Petkov , Kees Cook , Masahiro Yamada , "Steven Rostedt (VMware)" , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.19 162/237] kernel/panic.c: do not append newline to the stack protector panic string Date: Sat, 16 Nov 2019 10:39:57 -0500 Message-Id: <20191116154113.7417-162-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154113.7417-1-sashal@kernel.org> References: <20191116154113.7417-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov [ Upstream commit 95c4fb78fb23081472465ca20d5d31c4b780ed82 ] ... because panic() itself already does this. Otherwise you have line-broken trailer: [ 1.836965] ---[ end Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: pgd_alloc+0x29e/0x2a0 [ 1.836965] ]--- Link: http://lkml.kernel.org/r/20181008202901.7894-1-bp@alien8.de Signed-off-by: Borislav Petkov Acked-by: Kees Cook Cc: Masahiro Yamada Cc: "Steven Rostedt (VMware)" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- kernel/panic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/panic.c b/kernel/panic.c index 72e001e3753e3..8138a676fb7d1 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -636,7 +636,7 @@ device_initcall(register_warn_debugfs); */ __visible void __stack_chk_fail(void) { - panic("stack-protector: Kernel stack is corrupted in: %pB\n", + panic("stack-protector: Kernel stack is corrupted in: %pB", __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -- 2.20.1