From patchwork Fri Feb 2 06:56:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 195653 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp252875dyc; Thu, 1 Feb 2024 23:02:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IExewogbvwTEINJ3Wt8npj+4tHu3W9ssvmSzKsJnYfrcFqRdRwOuFZwx9O8E5g3o+flTjgx X-Received: by 2002:a6b:d910:0:b0:7c0:3441:a7cd with SMTP id r16-20020a6bd910000000b007c03441a7cdmr1405099ioc.0.1706857332926; Thu, 01 Feb 2024 23:02:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706857332; cv=pass; d=google.com; s=arc-20160816; b=l15Mz0Nggmy3YDY6XTgWgJfv6wDMzhOCX9Vl8wh5+F4Zl7sM3hoOliU9evdySV6kdN uc2Oi9XtilN5mkRiky4ohS63iLCH0lQHfUfgZ0EESk4U8eLGbHzAXIXBhIQTxFNY85hU KQ3Mm9oBoTsYYR4lwAkVfC59JjKNZxhr4Vc2B1H/3hkKrUfCIVZmCvMhILmio5perhmI 9I0uJJRul5V6h8t9/ByMitOkGBtSTRM+WF66qa3ydrGsfKn+EnDcAhk9yULyCAc19xva nLr2FkuYmw6hwPSA/Hc7NCqm6GcziNdNRMKH/5ojbi+U5SBGEXzpZBG6OclBzvZPqwks htfg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Ci6Q85DG+4I/5ZY4IFhwMXUeIWUvTs7tkOWuok6FjaU=; fh=Os4RYsKyMNFlnOEZ7UIhGsSEuf0OVXcHQSO2hAkOfBY=; b=zVt9Dnn3MTxT8iwqY0aZzl+3BeUAN0DhlBRrwBJvuJ7MCoS1cuRB6QQuO+nnh+dZW9 mJfMal0ZaTBDXjDYu7BAxFcDthRQ/vzWDMR5w/mssIM4He6XJWCbBHzDu4F0B+hz/VxR Gft+m8jCrt9cv4Q2KIZygS+tH4RNjt5cK+gFwa3XxsvI7sSdZlDLWvsQdeO6WXKc3ME/ d3MoR3jtrfXJW3Q4IvlXFk1NTuVihfldr1igGcAtgJh+ucNoyD5uGJ1jTCO54IQpBO5T kT1u5qslF66ZP95i486zyIjRp6HW0W0vyUlga22EZLGv3wrXblD7MqIDxoyTSmxG/C+y atXA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VVU03+NQ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-49338-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49338-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCWVRsxSciY/MRMhaRgNmEPkmIeiXrZd2iYtntOR5kKTgpW/dUTpc6JsEL5IFMMdeU/jusVNFjPql+lLRKWmXvhIuouamg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id l32-20020a635b60000000b005d67007b43dsi1105936pgm.571.2024.02.01.23.02.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 23:02:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49338-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VVU03+NQ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-49338-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49338-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 9F57C292D26 for ; Fri, 2 Feb 2024 07:02:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1A28E4C62E; Fri, 2 Feb 2024 06:56:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VVU03+NQ" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42F404A99C; Fri, 2 Feb 2024 06:56:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706857005; cv=none; b=XEwTG77xSOmKXNIClABx8AqQytHy53JvUP2v2YcolD/q3DEGFWZBHTdwKNrcKWtxFo/SCiTROgsQ04Edr/cEY1vVtyZISvudcseYlMdCovw5LdL06TgHOKGtn/VTmWWem1zvQrlQ055HjRquhc16Z7YhZjwNtkcL05zmtoGhZ9A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706857005; c=relaxed/simple; bh=iv8M0VVwLR+J8qViltmqr1VCLaV0asCVn17nf33N41A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sMDTyKUQ0RT1lyfsdCnwYQdmItEpqTjNCT11ScuzEmCKIBDxcM0WGMzwS26tGcpGB5tLdo9KkEsJS7OVnBdzVWwuJMvt+CfzhqSeZgRforlv1UrPl9skF4NkpGmC0xzHCe0NdzWOWLqQbq/psqxjen976CnVPiCki10LZ8sm9I0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VVU03+NQ; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CE8EC43394; Fri, 2 Feb 2024 06:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706857005; bh=iv8M0VVwLR+J8qViltmqr1VCLaV0asCVn17nf33N41A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VVU03+NQ/chDLzbyR5IiLeEN4h/MMNrH/Xg9npNv6ZyjaMiifhgyZfHCPrdeTo9JE S0EYRGPIfAer8r4tnag5qldCgCAQUoYzKsywp3yVYSUUC4G1y+h5bEiLil9xJKH0Yj oKkQRqeJM5fTKsH/nHXQzi8P26yduZ+F8kVYPW4U4nPTMIQ5s1+UEohndlKpl8UGSa 0Qy2MsSxSAOolhGpoKmTQNMTZimrcXSsTTA4XVvZeYV37QZKBCbXpbiBOmEO+KKNE2 ls0QwF+w9d4k5wvHbaQVW9dNh7CP31mZQ4NohYCBXdes1gHXm3lhOFGgV12mXgnojm plKK+hLt8f1kw== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" Subject: [PATCH 22/22] tty: vt: decrypt magic constants in vc_is_control() Date: Fri, 2 Feb 2024 07:56:08 +0100 Message-ID: <20240202065608.14019-23-jirislaby@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240202065608.14019-1-jirislaby@kernel.org> References: <20240202065608.14019-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789769634556340706 X-GMAIL-MSGID: 1789769634556340706 0x0d00ff81 and 0x0800f501 are bitmasks of ASCII characters. Spell them explicitly using BIT() + ASCII constants. GENMASK() is used for the 9-bit range in CTRL_ACTION. This also modifies the 'if' checking if the masks should be applied. From a "random" ' ' to the actual size of the bitmasks' type. Signed-off-by: Jiri Slaby (SUSE) --- drivers/tty/vt/vt.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index e35f7a31a7bd..463be4e48dc8 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -2893,9 +2893,13 @@ static bool vc_is_control(struct vc_data *vc, int tc, int c) * as cursor movement) and should not be displayed as a glyph unless * the disp_ctrl mode is explicitly enabled. */ - static const u32 CTRL_ACTION = 0x0d00ff81; + static const u32 CTRL_ACTION = BIT(ASCII_NULL) | + GENMASK(ASCII_SHIFTIN, ASCII_BELL) | BIT(ASCII_CANCEL) | + BIT(ASCII_SUBSTITUTE) | BIT(ASCII_ESCAPE); /* Cannot be overridden by disp_ctrl */ - static const u32 CTRL_ALWAYS = 0x0800f501; + static const u32 CTRL_ALWAYS = BIT(ASCII_NULL) | BIT(ASCII_BACKSPACE) | + BIT(ASCII_LINEFEED) | BIT(ASCII_SHIFTIN) | BIT(ASCII_SHIFTOUT) | + BIT(ASCII_CAR_RET) | BIT(ASCII_FORMFEED) | BIT(ASCII_ESCAPE); if (vc->vc_state != ESnormal) return true; @@ -2912,7 +2916,7 @@ static bool vc_is_control(struct vc_data *vc, int tc, int c) * useless without them; to display an arbitrary font position use the * direct-to-font zone in UTF-8 mode. */ - if (c < ' ') { + if (c < BITS_PER_TYPE(CTRL_ALWAYS)) { if (vc->vc_disp_ctrl) return CTRL_ALWAYS & BIT(c); else