From patchwork Tue Mar 10 12:40:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229568 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, 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 D23DCC10F27 for ; Tue, 10 Mar 2020 13:21:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABB25208E4 for ; Tue, 10 Mar 2020 13:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846484; bh=YcuXAvjdUZaz93rApUSzNq11TGPMtEnbZIjQWbayKQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oSckQA01t6MaclapwX46tAqsVEg5EVfGykgi5TjPI8vzVZslVaf3I+snCMteI2tos 8HdSkF16fhi0E312OY7sL6vOac53OtxE8rjKtJjP04fN/XdKfYNz5BzMPSf13p5zVP bTpo06DmelTU/Tz6eGfksG9GAaq2ZpXdNKfYb3P0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730814AbgCJNGN (ORCPT ); Tue, 10 Mar 2020 09:06:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:51722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730809AbgCJNGM (ORCPT ); Tue, 10 Mar 2020 09:06:12 -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 AAADD24694; Tue, 10 Mar 2020 13:06:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583845572; bh=YcuXAvjdUZaz93rApUSzNq11TGPMtEnbZIjQWbayKQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IfeRPwCLUmWyIm+HaX2b/sTwRovl8T9L+5m90fTKdTq6onuDxwFLhMJYtKRFrHrRE 8a/+Cw7XAEqlvtQX2svPiTdKUtU6yRv3pdPly2EooRDfeLlbL2pAr9+1qRkbWpgFaM yDs8CYOc8qt00KALCJtt43aBGPcBTicTDbU7B/S0= 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.14 024/126] sysrq: Restore original console_loglevel when sysrq disabled Date: Tue, 10 Mar 2020 13:40:45 +0100 Message-Id: <20200310124206.055710550@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310124203.704193207@linuxfoundation.org> References: <20200310124203.704193207@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 : ");