Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp10656481rwl; Thu, 12 Jan 2023 00:24:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXtSKCvRCghzHLBK8XUTzRFM0602YVRF7jB1T1aHBFzIFch1GtoqMM7TGOp5/XW2he/EzHGM X-Received: by 2002:a17:906:7f99:b0:84d:2f2a:b158 with SMTP id f25-20020a1709067f9900b0084d2f2ab158mr17196539ejr.11.1673511840210; Thu, 12 Jan 2023 00:24:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673511840; cv=none; d=google.com; s=arc-20160816; b=0TibLkYqHbS2g4FApPccN2vTLJVgFJ3zVe8YVGGuM/jMvCPgOboIhZ2urYXv4a8iH8 R8us7dHpw3Z/syqu4U8LshBC0MwpgHOkUY0/V8E30b8cjnW4Q8MrBQvzsAVOKmrb3F7j 8zkr/4BgSgClVRkQOgyqZXxSL2PcL7wqJ+EAqvmqBZACuZclSrTvjBO9TXh5H62qtpJF LP7LUKXtbKyS9bO7fOSo+s5CCOmgg49vKrzx8vu6rEmtrmseUfatjPmNUSweqHYvs3Ee arHrzrr8kPXX8SaMfKYMuA9SJe51mtoPmHM+rYa+PzbwZ7XrTSixyMb8bqBePgy7M+iE jpLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=a4kKvilk3J7VYGY9tQtDMWiZ48iwRUgaObT+2ythxhk=; b=l3LNYNKyO+IhR3jNG8FrLGmMup6C3KVVKCmdhK7rAX44WMslCVtzD8DLMjZxFsgikA NaJB2qY0cwFvVrpxTvHBmpEy4eehFxJjaEtagmA9h+0GUaR3wmUMocceUDIlCbSICWuc /lmUrGw5GOJtWpSo92+FyXQl/lTpLEFvAGjp4nF7ETkk0mtwmztK9KP7wptpYB7iQiWv pknYQ3CiwcAIGktRUuc15RuDp8cC7kIH21sFe3zBRPjn0XnA8pS1enIrknOzpnV2YV8D Q3NFPKgFBcbArVfjntLGvKUOCn92dOSIKptDFN2BuDBHD/uAZKRYu00/FHd4tc1NdHGt geGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CI2n9j+8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xh9-20020a170906da8900b0084d2c9af2e9si7973728ejb.828.2023.01.12.00.23.48; Thu, 12 Jan 2023 00:24:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CI2n9j+8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239576AbjALICu (ORCPT + 50 others); Thu, 12 Jan 2023 03:02:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236638AbjALICF (ORCPT ); Thu, 12 Jan 2023 03:02:05 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 213BEDEAA; Thu, 12 Jan 2023 00:01:52 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id D8797B81D93; Thu, 12 Jan 2023 08:01:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D513C433F0; Thu, 12 Jan 2023 08:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673510509; bh=7jyvgoiUqyV5fZmP+U6F8jiyQbC43zHivnClvOwaS84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CI2n9j+8RcxOoT54IEJ0wWhYF+7vAxP8SQL+M4KkPB0Z5JKrZsQHz/mXAhSDqbUoo yMqaUwlqkwzK5JB6y5Iab5Mt4Bkd0JxxW5PmyMvelpp7vDwn2myHjetSlokatnLMBL IFuuZO7pAcMUeaCdzs7dp2lTFo18GaIzjJfiBMLtjIGcznfiMVi48nuAn5CLSYw1Ka 4//mO0KJDTXoq991WyoTDASJilHYernTadsBX7qVvgM2uMzXhgXIbB1moEqv4P7NUR piLAZdsGLxPBpA6jWQGLxCDQUwZzezjhJJ41M0JCPUZRNaGT8+T897o67d+OtZKB1z CzmH5445frQBg== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: Kees Cook , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" Subject: [PATCH 07/11] tty: vt: replace BUG_ON() by WARN_ON_ONCE() Date: Thu, 12 Jan 2023 09:01:32 +0100 Message-Id: <20230112080136.4929-7-jirislaby@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230112080136.4929-1-jirislaby@kernel.org> References: <20230112080136.4929-1-jirislaby@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No need to panic in vc_uniscr_copy_line(), just warn. This should never happen though, as vc_uniscr_check() is supposed to be called before vc_uniscr_copy_line(). And the former checks vc->vc_uni_lines already. In any case, use _ONCE as vc_uniscr_copy_line() is called repeatedly for each line. So don't flood the logs, just in case. Signed-off-by: Jiri Slaby (SUSE) --- drivers/tty/vt/vt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 119b3eafef59..db72375141b0 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -535,7 +535,8 @@ void vc_uniscr_copy_line(const struct vc_data *vc, void *dest, bool viewed, int offset = row * vc->vc_size_row + col * 2; unsigned long pos; - BUG_ON(!uni_lines); + if (WARN_ON_ONCE(!uni_lines)) + return; pos = (unsigned long)screenpos(vc, offset, viewed); if (pos >= vc->vc_origin && pos < vc->vc_scr_end) { -- 2.39.0