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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 2BD1AC3F2D1 for ; Tue, 3 Mar 2020 18:00:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 07B7A206D5 for ; Tue, 3 Mar 2020 18:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258430; bh=YcuXAvjdUZaz93rApUSzNq11TGPMtEnbZIjQWbayKQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IC020Qfoagjex2nd3/eOsql+F+ckouyhTh8rsTr+O2xJ9MfEcznGJ34xh0a3wvi9z MmgBvLmNFJjGtOZ3yg8b3sFUVdsUUo75kUSBTCSNO+WQqxxs3AaqWlfBl4fTymH24r JyP/D1vgEf80JVwHwWpZcouOXT/IFCwQEJZHvmIg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387784AbgCCSA2 (ORCPT ); Tue, 3 Mar 2020 13:00:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:44176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732698AbgCCSAZ (ORCPT ); Tue, 3 Mar 2020 13:00:25 -0500 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 607B420728; Tue, 3 Mar 2020 18:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258424; bh=YcuXAvjdUZaz93rApUSzNq11TGPMtEnbZIjQWbayKQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=li+opimUPv0rgmzNpO7Gr9Re7Jx+jyuvT2AR1NcaXjMN75ytRLXPnie0Pu5O45HmQ 0lahCyod9x9tOh1RmbJ4kObvn30qOhZGmHQ6wBMYXENr30Cc4Jh3QZOW/8lsFsU+m4 WYKjRCJWK5Jlqk5++l3cB/IB/m/tqNlNUuq3/V/Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Petr Mladek , Sergey Senozhatsky , "Steven Rostedt (VMware)" , Tommi Rantala Subject: [PATCH 4.19 27/87] sysrq: Restore original console_loglevel when sysrq disabled Date: Tue, 3 Mar 2020 18:43:18 +0100 Message-Id: <20200303174353.190378657@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174349.075101355@linuxfoundation.org> References: <20200303174349.075101355@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 From: Petr Mladek commit 075e1a0c50f59ea210561d0d0fedbd945615df78 upstream. The sysrq header line is printed with an increased loglevel to provide users some positive feedback. The original loglevel is not restored when the sysrq operation is disabled. This bug was introduced in 2.6.12 (pre-git-history) by the commit ("Allow admin to enable only some of the Magic-Sysrq functions"). Signed-off-by: Petr Mladek Reviewed-by: Sergey Senozhatsky Reviewed-by: Steven Rostedt (VMware) Cc: Tommi Rantala Signed-off-by: Greg Kroah-Hartman --- drivers/tty/sysrq.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -560,6 +560,7 @@ void __handle_sysrq(int key, bool check_ op_p->handler(key); } else { pr_cont("This sysrq operation is disabled.\n"); + console_loglevel = orig_log_level; } } else { pr_cont("HELP : ");