Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 30 Nov 2018 01:55:42 -0800
From:   tip-bot for YiFei Zhu <tipbot@zytor.com>
Message-ID: <tip-79c2206d369b87b19ac29cb47601059b6bf5c291@git.kernel.org>
Cc:     natechancellor@gmail.com, mingo@kernel.org, hpa@zytor.com,
        hdegoede@redhat.com, marc.zyngier@arm.com, dave.hansen@intel.com,
        bhsharma@redhat.com, zhuyifei1999@gmail.com,
        linux-kernel@vger.kernel.org, sai.praneeth.prakhya@intel.com,
        matt@codeblueprint.co.uk, peterz@infradead.org,
        jonathanh@nvidia.com, torvalds@linux-foundation.org,
        eric.snowberg@oracle.com, bp@alien8.de, luto@kernel.org,
        julien.thierry@arm.com, ard.biesheuvel@linaro.org,
        sedat.dilek@gmail.com, joe@perches.com,
        arend.vanspriel@broadcom.com, tglx@linutronix.de
Reply-To: sai.praneeth.prakhya@intel.com, linux-kernel@vger.kernel.org,
          jonathanh@nvidia.com, peterz@infradead.org,
          matt@codeblueprint.co.uk, torvalds@linux-foundation.org,
          natechancellor@gmail.com, hpa@zytor.com, mingo@kernel.org,
          hdegoede@redhat.com, marc.zyngier@arm.com, dave.hansen@intel.com,
          bhsharma@redhat.com, zhuyifei1999@gmail.com, luto@kernel.org,
          julien.thierry@arm.com, ard.biesheuvel@linaro.org,
          joe@perches.com, arend.vanspriel@broadcom.com,
          sedat.dilek@gmail.com, tglx@linutronix.de,
          eric.snowberg@oracle.com, bp@alien8.de
In-Reply-To: <20181129171230.18699-12-ard.biesheuvel@linaro.org>
References: <20181129171230.18699-12-ard.biesheuvel@linaro.org>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:efi/core] x86/earlyprintk/efi: Fix infinite loop on some
 screen widths
Git-Commit-ID: 79c2206d369b87b19ac29cb47601059b6bf5c291
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  79c2206d369b87b19ac29cb47601059b6bf5c291
Gitweb:     https://git.kernel.org/tip/79c2206d369b87b19ac29cb47601059b6bf5c291
Author:     YiFei Zhu <zhuyifei1999@gmail.com>
AuthorDate: Thu, 29 Nov 2018 18:12:30 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 30 Nov 2018 09:05:13 +0100

x86/earlyprintk/efi: Fix infinite loop on some screen widths

An affected screen resolution is 1366 x 768, which width is not
divisible by 8, the default font width. On such screens, when longer
lines are earlyprintk'ed, overflow-to-next-line can never trigger,
due to the left-most x-coordinate of the next character always less
than the screen width. Earlyprintk will infinite loop in trying to
print the rest of the string but unable to, due to the line being
full.

This patch makes the trigger consider the right-most x-coordinate,
instead of left-most, as the value to compare against the screen
width threshold.

Signed-off-by: YiFei Zhu <zhuyifei1999@gmail.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arend van Spriel <arend.vanspriel@broadcom.com>
Cc: Bhupesh Sharma <bhsharma@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Eric Snowberg <eric.snowberg@oracle.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Joe Perches <joe@perches.com>
Cc: Jon Hunter <jonathanh@nvidia.com>
Cc: Julien Thierry <julien.thierry@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20181129171230.18699-12-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/platform/efi/early_printk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/platform/efi/early_printk.c b/arch/x86/platform/efi/early_printk.c
index 7476b3b097e1..7138bc7a265c 100644
--- a/arch/x86/platform/efi/early_printk.c
+++ b/arch/x86/platform/efi/early_printk.c
@@ -183,7 +183,7 @@ early_efi_write(struct console *con, const char *str, unsigned int num)
 			num--;
 		}
 
-		if (efi_x >= si->lfb_width) {
+		if (efi_x + font->width > si->lfb_width) {
 			efi_x = 0;
 			efi_y += font->height;
 		}