ACPICA: utilities: Fix overflow check in vsnprintf()

[ Upstream commit 12b660251007e00a3e4d47ec62dbe3a7ace7023e ]

ACPICA commit d9d59b7918514ae55063b93f3ec041b1a569bf49

The old version breaks sprintf on 64-bit systems for buffers
outside [0..UINT32_MAX].

Link: https://github.com/acpica/acpica/commit/d9d59b79
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/4994935.GXAFRqVoOG@rjwysocki.net
Signed-off-by: gldrk <me@rarity.fan>
[ rjw: Added the tag from gldrk ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/acpi/acpica/utprint.c b/drivers/acpi/acpica/utprint.c
index 05426596d1f4aae21fb52530534683b0674b9fcb..f910714b51f3448165cb5352dbd26114249fb9c2 100644 (file)
--- a/drivers/acpi/acpica/utprint.c
+++ b/drivers/acpi/acpica/utprint.c
@@ -333,11 +333,8 @@ int vsnprintf(char *string, acpi_size size, const char *format, va_list args)
 
        pos = string;
 
-       if (size != ACPI_UINT32_MAX) {
-               end = string + size;
-       } else {
-               end = ACPI_CAST_PTR(char, ACPI_UINT32_MAX);
-       }
+       size = ACPI_MIN(size, ACPI_PTR_DIFF(ACPI_MAX_PTR, string));
+       end = string + size;
 
        for (; *format; ++format) {
                if (*format != '%') {