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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59E35C433EF for ; Tue, 7 Jun 2022 18:29:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351119AbiFGS3U (ORCPT ); Tue, 7 Jun 2022 14:29:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351207AbiFGSXO (ORCPT ); Tue, 7 Jun 2022 14:23:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 362D4C6866; Tue, 7 Jun 2022 10:54:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8BDE66182B; Tue, 7 Jun 2022 17:54:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B66AEC36AFE; Tue, 7 Jun 2022 17:54:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654624456; bh=KgLkVpm/eCq7pTrqhy/1TWHRr1bnRifLYUD1rkYJal0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LAq/azVIsgQb1sAmq2zDJ5wXOu2D34JmAbTKrmNGojicMzrEE7eSjGkujGPxBz58m fNyaLy/jB9nvCDLiQp7FRexSmWzT6uFqU/vAWHEW0+5uNMEM821FnO3IUEPaK0e3r0 wOiIPr9as3vnJnKZbGLWVUak7oTBPC1IQbgwitHTye5eq6xy22L1gQs6iss5EyA7/i nmR1NgSXXiBrVCQ51dg3P2nf4ZzFQtjXKLuuHLAhv+gfQlNw78hq3KDqYwqKMp+UxJ a/Cniucsy+N38neoRTLLO2K/ieXEUWG0sE6i54L3QzbTi0fAOK2jBoBSguAZMAmn6u 34xJ5lE64CuXw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Ogness , Marek Szyprowski , Petr Mladek , Greg Kroah-Hartman , Sasha Levin , agross@kernel.org, bjorn.andersson@linaro.org, jirislaby@kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 28/60] serial: msm_serial: disable interrupts in __msm_console_write() Date: Tue, 7 Jun 2022 13:52:25 -0400 Message-Id: <20220607175259.478835-28-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607175259.478835-1-sashal@kernel.org> References: <20220607175259.478835-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Ogness [ Upstream commit aabdbb1b7a5819e18c403334a31fb0cc2c06ad41 ] __msm_console_write() assumes that interrupts are disabled, but with threaded console printers it is possible that the write() callback of the console is called with interrupts enabled. Explicitly disable interrupts using local_irq_save() to preserve the assumed context. Reported-by: Marek Szyprowski Reviewed-by: Petr Mladek Signed-off-by: John Ogness Link: https://lore.kernel.org/r/20220506213324.470461-1-john.ogness@linutronix.de Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/msm_serial.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index 23c94b927776..e676ec761f18 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -1599,6 +1599,7 @@ static inline struct uart_port *msm_get_port_from_line(unsigned int line) static void __msm_console_write(struct uart_port *port, const char *s, unsigned int count, bool is_uartdm) { + unsigned long flags; int i; int num_newlines = 0; bool replaced = false; @@ -1616,6 +1617,8 @@ static void __msm_console_write(struct uart_port *port, const char *s, num_newlines++; count += num_newlines; + local_irq_save(flags); + if (port->sysrq) locked = 0; else if (oops_in_progress) @@ -1661,6 +1664,8 @@ static void __msm_console_write(struct uart_port *port, const char *s, if (locked) spin_unlock(&port->lock); + + local_irq_restore(flags); } static void msm_console_write(struct console *co, const char *s, -- 2.35.1