From patchwork Sat Oct 31 11:36:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 317364 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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D8A15C4742C for ; Sat, 31 Oct 2020 11:49:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 976C220731 for ; Sat, 31 Oct 2020 11:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144940; bh=I+TfRrtOHjm2xVC8apdTzw7RjU4U7ZFsLqAXwmihjcg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IG3SSFk1O3QA5W4aRnoKDsuQqmgS2XDl5I+Uyc956VM4hzvNhyVN7FcNRYKKoda0R Yx0yTKMl5igtA2UOa8MlkMxdmDayRe226yIIP+KsRzm/JPJ51C7KnDZhjD1Cm5JCM5 e2LOsX3YQwvqEpTgpCMJ1zlRMmoj28KcubXCy4dA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727958AbgJaLnS (ORCPT ); Sat, 31 Oct 2020 07:43:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:43164 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727989AbgJaLnP (ORCPT ); Sat, 31 Oct 2020 07:43:15 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 B64B4205F4; Sat, 31 Oct 2020 11:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144595; bh=I+TfRrtOHjm2xVC8apdTzw7RjU4U7ZFsLqAXwmihjcg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qykULf1tVUR0FuO16sOBDSlGzLwcnIDkryZeGjl/S8b18sVbAHYH86STIotd5fBRV rrW5pFog+a1sxnlUXme8fbaPWVYakT4iTxkG8vQwcS8OqgebRNBL+C6sK2uMPsCg92 CeVcYFaUwf2xlEZvWQtORqYL/SPkPX/XAUFMqOP4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Vyukov , Thomas Gleixner Subject: [PATCH 5.8 51/70] x86/traps: Fix #DE Oops message regression Date: Sat, 31 Oct 2020 12:36:23 +0100 Message-Id: <20201031113501.945389765@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201031113459.481803250@linuxfoundation.org> References: <20201031113459.481803250@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thomas Gleixner commit 5f1ec1fd32252af5130dac23b5542e8e66fe0bcb upstream. The conversion of #DE to the idtentry mechanism introduced a change in the Ooops message which confuses tools which parse crash information in dmesg. Remove the underscore from 'divide_error' to restore previous behaviour. Fixes: 9d06c4027f21 ("x86/entry: Convert Divide Error to IDTENTRY") Reported-by: Dmitry Vyukov Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/CACT4Y+bTZFkuZd7+bPArowOv-7Die+WZpfOWnEO_Wgs3U59+oA@mail.gmail.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -196,7 +196,7 @@ static __always_inline void __user *erro DEFINE_IDTENTRY(exc_divide_error) { - do_error_trap(regs, 0, "divide_error", X86_TRAP_DE, SIGFPE, + do_error_trap(regs, 0, "divide error", X86_TRAP_DE, SIGFPE, FPE_INTDIV, error_get_trap_addr(regs)); }