Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1oz3fu-0003T9-TC for mharc-grub-devel@gnu.org; Sat, 26 Nov 2022 17:29:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oz3a6-0002ar-0S for grub-devel@gnu.org; Sat, 26 Nov 2022 17:23:30 -0500 Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oz3a4-0004of-L3 for grub-devel@gnu.org; Sat, 26 Nov 2022 17:23:29 -0500 Received: by mail-qt1-x830.google.com with SMTP id w9so4472695qtv.13 for ; Sat, 26 Nov 2022 14:23:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=g5zzdtMrHFZ2fzFkt8eXwI1l03eTetFyU0Ff5BANUUQ=; b=o+QFYV2Wqx2dTTmOvEpAGHRd4l3ZoVB3rKIhzyxQfF5kMmaZu9gV2NQ295aASX3Q2f 2rPA9fRdJtmqd7PiYJhu4KurdwOMB7Yil5ZR6KERipynuDEJCX3swi5i2CZjf1rX7EqJ 6iio6/dGS9DwClvluGRZvD/kxuN8JjAbvu5eWNPuM0z6UuBsxEMPkuhLEkIAf3jDcAiC ztbUpObikPUyc/Z5bVMeTgEvJsmGKzJVlVjCKQR0z+9ieOowBp0l8K1fr7729okYlqsk tf8D+3D18Jp2S1JeX07rkctWtM9lxJq1JTy4kmyi2wAg6ipV/EJmHwY4e9yXRYl8jg8X Om4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g5zzdtMrHFZ2fzFkt8eXwI1l03eTetFyU0Ff5BANUUQ=; b=7FcERxe7GxdpjF4dLoQ6ys/EMOvC5uA7XuaRvS322l4FTIB4qSK8XFmcnxED1VTc4X qMqCHNnM3KUD0JvNk0hijIDzWew/0KXkl9zRAVMcp3/YzFmx9z99Bwrjbihs6au4teTz 4SrfnvtI2kwHBr6VaNo02xNq0Zp9sdw/mLHKO/osPir7U8/O05snbfHmLhTVdTPALgVQ l81EzZSExkwnk0cw3LWWEt2x/kfOP0gUBX+lD2yrT5q0pKSIrTSwKLlzE12xZe8+47vc rgXlL6EPsu3nbVvtOzc0mQBBm468L5lRGvlKV4zMt367tTbU8UMwyfVHcQagZg49RV1F LG2w== X-Gm-Message-State: ANoB5pl+XhwK3+Zp0io4RqnCzkmKCO/3BN4LTi0w89RwhhIzBg1qrAK0 y30kHVmFWxfABwu29bWCfKTcr/aRi7w= X-Google-Smtp-Source: AA0mqf5kAylEwN1f1z/geWvHPKaBEM7dhEV26CI6JVa6TAFd/ygz/WT4blLi+EoqdUmjUtjDNS470g== X-Received: by 2002:ac8:46c3:0:b0:3a5:a877:5095 with SMTP id h3-20020ac846c3000000b003a5a8775095mr28777439qto.463.1669501407577; Sat, 26 Nov 2022 14:23:27 -0800 (PST) Received: from localhost.localdomain ([2601:195:c000:2821:5ced:866d:36e0:6fcd]) by smtp.gmail.com with ESMTPSA id y18-20020a05620a25d200b006eeb3165565sm5314286qko.80.2022.11.26.14.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 14:23:27 -0800 (PST) From: Ryan Cohen To: grub-devel@gnu.org Cc: Ryan Cohen Subject: [PATCH 1/2] vga_text: Prevent out-of-bounds writes to VGA text buffer Date: Sat, 26 Nov 2022 17:22:51 -0500 Message-Id: <20221126222252.764937-2-rcohenprogramming@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221126222252.764937-1-rcohenprogramming@gmail.com> References: <20221126222252.764937-1-rcohenprogramming@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::830; envelope-from=rcohenprogramming@gmail.com; helo=mail-qt1-x830.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 26 Nov 2022 17:29:29 -0500 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Nov 2022 22:23:30 -0000 Coordinates passed to screen_write_char() did not have any checks to ensure they are not out-of-bounds. This adds an if statement to prevent out-of-bounds writes to the VGA text buffer. Signed-off-by: Ryan Cohen --- grub-core/term/i386/pc/vga_text.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/grub-core/term/i386/pc/vga_text.c b/grub-core/term/i386/pc/vga_text.c index 669d06fad..b88fa9d2e 100644 --- a/grub-core/term/i386/pc/vga_text.c +++ b/grub-core/term/i386/pc/vga_text.c @@ -63,7 +63,8 @@ static grub_uint8_t cur_color = 0x7; static void screen_write_char (int x, int y, short c) { - VGA_TEXT_SCREEN[y * COLS + x] = grub_cpu_to_le16 (c); + if (x < COLS && y < ROWS && x >= 0 && y >= 0) + VGA_TEXT_SCREEN[y * COLS + x] = grub_cpu_to_le16 (c); } static short -- 2.38.1