From patchwork Thu Jul 20 13:44:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Simmons-Talbott X-Patchwork-Id: 1810474 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=JFG/XQ6H; dkim-atps=neutral Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6DT62Y5Dz20Cs for ; Thu, 20 Jul 2023 23:44:58 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E12D13856DCE for ; Thu, 20 Jul 2023 13:44:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E12D13856DCE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689860695; bh=bvyaoh3PSqva66WFKoPk+uDlmdPYGfWGuVo97Av9CEo=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=JFG/XQ6HBRisOD9IoqEjU29rmykY4jIQ6kvhsheqCCEvb+svhMAH6Ovo1rUbJCwrg NaimhegNyc05z2flUP38+5C2PuNiuoq35UpXoowvQ0DWCiPxmJ8Omr6ejD851oCOBq 7/BQW+KboiPFgxTgokSlRpi49MI4Q8eeW9Sc3QVI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id E42D73858CDB for ; Thu, 20 Jul 2023 13:44:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E42D73858CDB Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-K69uCTKTPquLX3De3hcuiA-1; Thu, 20 Jul 2023 09:44:35 -0400 X-MC-Unique: K69uCTKTPquLX3De3hcuiA-1 Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-440c41fd28eso124313137.2 for ; Thu, 20 Jul 2023 06:44:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689860675; x=1690465475; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bvyaoh3PSqva66WFKoPk+uDlmdPYGfWGuVo97Av9CEo=; b=W2aRYNh/6KVKfVTt/Tk1uqOheskYAPVleAeGJS+Zka+2LIHPM88TfrY7amlWWjJhHF ddsOvDeJQZ89AK1V2tcU/4/Hhk4OUA4C7LgPJ30h9B8Yh78H+NMnBbzZTDmMQbUHeP4U B/AqC8I2D4LigiY9/pJ54G0pdhSdXkITLIzCXCfQhx+k/Y5hPo0k3679DAawoziVWjax S+DmRjMHJJXigHqowfwcidMvSREOo3lDImBA/iIZ/qfdt5YRGiRThv8NoziY/tUjOIpo OD+C6RMl1a8VByekFCLCUJfrUUIAjhV18aRsN5FdsopQGFasU1H6tNxZ9u1tamghO2+4 rE9g== X-Gm-Message-State: ABy/qLaZQaXPQgNJAtqlszUy4HU0nvtiIAbIGDJEOZoj4Tu9tnwVxwbz xiGiPBbHYy+zrE6BWSvtxJGlELdFE6K0vicZ9pdNHYJD1Xp+Hi2fX26VgacU+oxDMD880oYyM6z krPqG1Nq7V5Z8LLejKFwJ+08UuhuDInV59eUlGRVZZ3tHGJstKXBiLFE8waxaPF2nVpTocHpH+h GhUEVR X-Received: by 2002:a67:db8e:0:b0:443:ef68:1f06 with SMTP id f14-20020a67db8e000000b00443ef681f06mr3732559vsk.18.1689860674760; Thu, 20 Jul 2023 06:44:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlHMrpgR9kQnqfSHqHlvMCBZyR1txXoPZswTk6yJ7liJsoWYyUpSHgYz4sMyV/hjNj2bRpD6gw== X-Received: by 2002:a67:db8e:0:b0:443:ef68:1f06 with SMTP id f14-20020a67db8e000000b00443ef681f06mr3732534vsk.18.1689860674330; Thu, 20 Jul 2023 06:44:34 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id h10-20020a05620a10aa00b0076729e726cbsm251031qkk.22.2023.07.20.06.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 06:44:33 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v6] vfprintf-internal: Get rid of alloca. Date: Thu, 20 Jul 2023 09:44:29 -0400 Message-Id: <20230720134429.1419479-1-josimmon@redhat.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Joe Simmons-Talbott via Libc-alpha From: Joe Simmons-Talbott Reply-To: Joe Simmons-Talbott Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Avoid potential stack overflow from unbounded alloca. Use the existing scratch_buffer instead. Add testcases to exercise the code as suggested by Adhemerval Zanella Netto. Reviewed-by: Adhemerval Zanella --- Changes to v5: * Remove unneeded printf and add more tests for various argument counts. stdio-common/tst-vfprintf-user-type.c | 130 ++++++++++++++++++++++++++ stdio-common/vfprintf-internal.c | 23 ++++- 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/stdio-common/tst-vfprintf-user-type.c b/stdio-common/tst-vfprintf-user-type.c index 7cc69dc716..adcbf33c20 100644 --- a/stdio-common/tst-vfprintf-user-type.c +++ b/stdio-common/tst-vfprintf-user-type.c @@ -194,6 +194,136 @@ do_test (void) TEST_COMPARE_STRING (str, "[[(123, 457.000000) (123, 457.000000)]]"); free (str); + str = NULL; + TEST_VERIFY (asprintf_alias (&str, "%1$P %2$P %3$P %4$P %5$P %6$P", + 1L, 1.0, + 2L, 2.0, + 3L, 3.0, + 4L, 4.0, + 5L, 6.0, + 6L, 6.0) + >= 0); + free (str); + + str = NULL; + TEST_VERIFY (asprintf_alias (&str, "%1$P %2$P %3$P %4$P %5$P %6$P" + "%7$P %8$P %9$P %10$P %11$P %12$P", + 1L, 1.0, + 2L, 2.0, + 3L, 3.0, + 4L, 4.0, + 5L, 6.0, + 6L, 6.0, + 7L, 7.0, + 8L, 8.0, + 9L, 9.0, + 10L, 10.0, + 11L, 11.0, + 12L, 12.0) + >= 0); + free (str); + + str = NULL; + TEST_VERIFY (asprintf_alias (&str, "%1$P %2$P %3$P %4$P %5$P %6$P" + "%7$P %8$P %9$P %10$P %11$P %12$P" + "%13$P %14$P %15$P %16$P %17$P %18$P", + 1L, 1.0, + 2L, 2.0, + 3L, 3.0, + 4L, 4.0, + 5L, 6.0, + 6L, 6.0, + 7L, 7.0, + 8L, 8.0, + 9L, 9.0, + 10L, 10.0, + 11L, 11.0, + 12L, 12.0, + 13L, 13.0, + 14L, 14.0, + 15L, 15.0, + 16L, 16.0, + 17L, 17.0, + 18L, 18.0) + >= 0); + free (str); + + str = NULL; + TEST_VERIFY (asprintf_alias (&str, "%1$P %2$P %3$P %4$P %5$P %6$P" + "%7$P %8$P %9$P %10$P %11$P %12$P" + "%13$P %14$P %15$P %16$P %17$P %18$P" + "%19$P %20$P %21$P %22$P %23$P %24$P", + 1L, 1.0, + 2L, 2.0, + 3L, 3.0, + 4L, 4.0, + 5L, 6.0, + 6L, 6.0, + 7L, 7.0, + 8L, 8.0, + 9L, 9.0, + 10L, 10.0, + 11L, 11.0, + 12L, 12.0, + 13L, 13.0, + 14L, 14.0, + 15L, 15.0, + 16L, 16.0, + 17L, 17.0, + 18L, 18.0, + 19L, 19.0, + 20L, 20.0, + 21L, 21.0, + 22L, 22.0, + 23L, 23.0, + 24L, 24.0) + >= 0); + free (str); + + str = NULL; + TEST_VERIFY (asprintf_alias (&str, "%1$P %2$P %3$P %4$P %5$P %6$P" + "%7$P %8$P %9$P %10$P %11$P %12$P" + "%13$P %14$P %15$P %16$P %17$P %18$P" + "%19$P %20$P %21$P %22$P %23$P %24$P" + "%25$P %26$P %27$P %28$P %29$P %30$P", + 1L, 1.0, + 2L, 2.0, + 3L, 3.0, + 4L, 4.0, + 5L, 6.0, + 6L, 6.0, + 7L, 7.0, + 8L, 8.0, + 9L, 9.0, + 10L, 10.0, + 11L, 11.0, + 12L, 12.0, + 13L, 13.0, + 14L, 14.0, + 15L, 15.0, + 16L, 16.0, + 17L, 17.0, + 18L, 18.0, + 19L, 19.0, + 20L, 20.0, + 21L, 21.0, + 22L, 22.0, + 23L, 23.0, + 24L, 34.0, + 25L, 25.0, + 26L, 26.0, + 27L, 27.0, + 28L, 28.0, + 29L, 29.0, + 30, 30.0) + >= 0); + free (str); + + str = NULL; + TEST_VERIFY (asprintf_alias (&str, "[[%1$P %1$P]]", 123L, 457.0) >= 0); + TEST_COMPARE_STRING (str, "[[(123, 457.000000) (123, 457.000000)]]"); + free (str); + str = NULL; TEST_VERIFY (asprintf_alias (&str, "[[%.1P]]", 1L, 2.0) >= 0); TEST_COMPARE_STRING (str, "[[{(1, 2.000000)}]]"); diff --git a/stdio-common/vfprintf-internal.c b/stdio-common/vfprintf-internal.c index f30a9e9f3a..6d6d96e800 100644 --- a/stdio-common/vfprintf-internal.c +++ b/stdio-common/vfprintf-internal.c @@ -1130,6 +1130,8 @@ printf_positional (struct Xprintf_buffer * buf, const CHAR_T *format, union printf_arg *args_value; int *args_size; int *args_type; + void *args_pa_user; + size_t args_pa_user_offset; { /* Calculate total size needed to represent a single argument across all three argument-related arrays. */ @@ -1146,6 +1148,7 @@ printf_positional (struct Xprintf_buffer * buf, const CHAR_T *format, now. */ args_size = &args_value[nargs].pa_int; args_type = &args_size[nargs]; + args_pa_user = &args_type[nargs]; memset (args_type, (mode_flags & PRINTF_FORTIFY) != 0 ? '\xff' : '\0', nargs * sizeof (*args_type)); } @@ -1235,7 +1238,25 @@ printf_positional (struct Xprintf_buffer * buf, const CHAR_T *format, else if (__glibc_unlikely (__printf_va_arg_table != NULL) && __printf_va_arg_table[args_type[cnt] - PA_LAST] != NULL) { - args_value[cnt].pa_user = alloca (args_size[cnt]); + while (args_pa_user + args_size[cnt] > + argsbuf.data + argsbuf.length) + { + args_pa_user_offset = args_pa_user - (void *) &args_type[nargs]; + if (!scratch_buffer_grow_preserve (&argsbuf)) + { + Xprintf_buffer_mark_failed (buf); + goto all_done; + } + args_value = argsbuf.data; + /* Set up the remaining two arrays to each point past the end of + the prior array, since space for all three has been allocated + now. */ + args_size = &args_value[nargs].pa_int; + args_type = &args_size[nargs]; + args_pa_user = (void *) &args_type[nargs] + args_pa_user_offset; + } + args_value[cnt].pa_user = args_pa_user; + args_pa_user += args_size[cnt]; (*__printf_va_arg_table[args_type[cnt] - PA_LAST]) (args_value[cnt].pa_user, ap_savep); }