From patchwork Tue Jan 31 09:38:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 63946 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 18BF73858404 for ; Tue, 31 Jan 2023 09:38:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 18BF73858404 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675157936; bh=VQSLmXH7FRFmLPP14VZqU9T8ytg0kWVxRFQqnp550Ak=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=sL6al5w9yMhsGvGDP3SCo3G5ZDorQcRghHkGt3x7FEp+1PXUCA8GkSKN2GMFSwuPg rm3nEBk8t6pug1MEFS2qdV1TwSmRI8VrUDHWuR8jisR6Rv0qjJaA5/0NkqUVksTm7H M2RpfyRnWj6ktZsJ3qEtPL5G+u3JRQ+GWu/Ct8HE= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id B5BDD3858D33 for ; Tue, 31 Jan 2023 09:38:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B5BDD3858D33 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-487-DhMXT6KOPI6nQ92mMXQd3g-1; Tue, 31 Jan 2023 04:38:29 -0500 X-MC-Unique: DhMXT6KOPI6nQ92mMXQd3g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BABF93C0DDAA for ; Tue, 31 Jan 2023 09:38:28 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.122]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E9F314171B6; Tue, 31 Jan 2023 09:38:27 +0000 (UTC) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [PATCH] libio: Update number of written bytes in dprintf implementation Date: Tue, 31 Jan 2023 10:38:21 +0100 Message-ID: <87k013vyb6.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The __printf_buffer_flush_dprintf function needs to record that the buffer has been written before reusing it. Without this accounting, dprintf always returns zero. Fixes commit 8ece45e4f586abd212d1c02d74d38ef681a45600 ("libio: Convert __vdprintf_internal to buffers. Tested on i686-linux-gnu and x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- libio/iovdprintf.c | 1 + stdio-common/Makefile | 1 + stdio-common/tst-dprintf-length.c | 45 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) base-commit: 2f39e44a8417b4186a7f15bfeac5d0b557e63e03 diff --git a/libio/iovdprintf.c b/libio/iovdprintf.c index fb359d263d..d9fa886fdf 100644 --- a/libio/iovdprintf.c +++ b/libio/iovdprintf.c @@ -54,6 +54,7 @@ __printf_buffer_flush_dprintf (struct __printf_buffer_dprintf *buf) } p += ret; } + buf->base.written += buf->base.write_ptr - buf->base.write_base; buf->base.write_ptr = buf->buf; } diff --git a/stdio-common/Makefile b/stdio-common/Makefile index da3034d847..34fdd6d1f8 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -180,6 +180,7 @@ tests := \ tst-bz11319 \ tst-bz11319-fortify2 \ tst-cookie \ + tst-dprintf-length \ tst-fdopen \ tst-ferror \ tst-fgets \ diff --git a/stdio-common/tst-dprintf-length.c b/stdio-common/tst-dprintf-length.c new file mode 100644 index 0000000000..abe2caf45a --- /dev/null +++ b/stdio-common/tst-dprintf-length.c @@ -0,0 +1,45 @@ +/* Test that dprintf returns the expected length. + Copyright (C) 2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include + +static int +do_test (void) +{ + /* Use a datagram socket to check that everything arrives in one packet. + The dprintf function should perform a single write call. */ + int fds[2]; + TEST_VERIFY_EXIT (socketpair (AF_LOCAL, SOCK_DGRAM, 0, fds) == 0); + + TEST_COMPARE (dprintf (fds[0], "(%d)%s[%d]", 123, "---", 4567), 14); + + char buf[32]; + ssize_t ret = read (fds[1], buf, sizeof (buf)); + TEST_VERIFY_EXIT (ret > 0); + TEST_COMPARE_BLOB (buf, ret, "(123)---[4567]", strlen ("(123)---[4567]")); + + close (fds[1]); + close (fds[0]); + return 0; +} + +#include