From patchwork Tue Mar 10 12:38:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229801 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=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 0A7E5C10F27 for ; Tue, 10 Mar 2020 12:40:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D229124695 for ; Tue, 10 Mar 2020 12:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583844044; bh=NzvRe/2oE5dJlgq8qNCZO77anKN8MyVNsNq6AYjQr5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jspE4choWrYagU/tAmQkZJi+3yfirekNO53A0AJnH1LtSlKl8dKj2TGuaq2mjPPjH WX97f+aM/Z+S6Kr90m2+NQz87WEs6+pS486j9TJRZT98GpKxZPPBD/TtfD7zDep5Qj 7WW7MijpcVilOw2SLTQEmzZG5xFkruEfSzS3gvVc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726438AbgCJMkn (ORCPT ); Tue, 10 Mar 2020 08:40:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:39626 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726271AbgCJMkm (ORCPT ); Tue, 10 Mar 2020 08:40:42 -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 E9A6A24691; Tue, 10 Mar 2020 12:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583844042; bh=NzvRe/2oE5dJlgq8qNCZO77anKN8MyVNsNq6AYjQr5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V4VaX/7ArRbtK8KPjnP6jn4eK2aR6shDV5R4iJiOI+a06K4QQIeQj0zLb8sWmOfnl 4aI/8yuqJfN/bXD5D78yOGapPoGSJ9Ufw3tDFA5omFyOsO6VS3zqc7rcJYSH58rfw2 NNpaZD8SiD5B+VY3Oke0rY3B7XCuhKrOEREctrYY= 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.4 10/72] sysrq: Restore original console_loglevel when sysrq disabled Date: Tue, 10 Mar 2020 13:38:23 +0100 Message-Id: <20200310123604.157751943@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123601.053680753@linuxfoundation.org> References: <20200310123601.053680753@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 @@ -556,6 +556,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 : ");