From patchwork Tue Sep 3 21:14:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 1980297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=XTgMD1qP; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wyz0T4mZQz1yg3 for ; Wed, 4 Sep 2024 07:14:49 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EE204386100E for ; Tue, 3 Sep 2024 21:14:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EE204386100E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1725398087; bh=UYR8ImgvebMapJMke9sNZhJbhXV9mBLB43sPki0O7+g=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=XTgMD1qPxORD9BjR9/os+28DHJbmzkRQVfost4npMUjdUydlLZL3fc6Kmtc97xAVD j/WCAn4/BUhjkMMVkvkIHPxKREhbQ+p45VlbS5xYhzpC3JpYwo7D/NsV3aXpOuqc0B /Tdwxs8qVt3KOyrEao6DHKDoCE/Hh8w9eso+k2wU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from dormouse.ash.relay.mailchannels.net (dormouse.ash.relay.mailchannels.net [23.83.222.50]) by sourceware.org (Postfix) with ESMTPS id A6A48385B50D for ; Tue, 3 Sep 2024 21:14:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A6A48385B50D Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=sourceware.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=sourceware.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A6A48385B50D Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=23.83.222.50 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1725398065; cv=pass; b=N8DS1cKMJj4XAacnCw6RqKYTH1pFlOz51Q6RjocHwPx7IU5orScX3Diy+oPbkizfSFwvSuIcMOkQZqECK/gmUYoKxXpyTG1MBqLSjuDaPASdlcOLyCNgmNKmxmBjVNuHBne6bWKYZN6IkT5A5gRDVBR0HPS5Fbotkc5IxrwViHI= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1725398065; c=relaxed/simple; bh=4znWpsMNmF8QW1lUhXzVH4SJQn3bposM2IVO+Y6qzzE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=SU/vOXUatSi7B3/E8KaaGrNUNJ/siVNES7twYObQJkTtmnTnlnm9axNQ2WOEpBcuEDe6mMUTd1SKGhjIjm+vOhjykLnB+wEnOf6IT7QTmRAcPaeAmZ4ATziAXrorYtcNgi7GV0RIBjafPxBf27MiYpLJlamKxDotsFkFWlUQbUE= ARC-Authentication-Results: i=2; server2.sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 396256C801A; Tue, 3 Sep 2024 21:14:22 +0000 (UTC) Received: from pdx1-sub0-mail-a207.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id C1F456C7FDD; Tue, 3 Sep 2024 21:14:21 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1725398061; a=rsa-sha256; cv=none; b=aQptxiTj0xpOKRI3AQ8lhG+GHt+UsODN0Ejoive9nPpykyBM69FfrH1VZybr3SYpHGtQvm D1kSqTGoGnWj4EvkFelPMIJ+f/9iLKoVcvXN/oh2WgnPf/tZOjRoEe8EOR/G9MOSkAmcW/ /ol3KwrHW1itACuxH/aZ55u5NexErrWwuY/AGx1cB6GLo1InusQVOTGodSpZ4jgNeEaGa3 a5rHxCfj2zmPcvkAZEEd9XmvA/Cn/aG/pULZw3pkIRKrhrrDB1LoJxj1GmTIE+GgBO8fEy J6aBeHBgFEChJil825EFICFEJSOWrBAcZWvG6WRlrFvJz52nnq89XEoebaRlEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1725398061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UYR8ImgvebMapJMke9sNZhJbhXV9mBLB43sPki0O7+g=; b=+KLcvfKTvFXc4jdsjPWHl5Xfvtzl0QP8eKg86F2tKluBSwPAzJPtNTD8d+WrBDrmMnc39c UZlZzsyOK9NPfHQNtsNfcEbkDli4vKc47MwJfEHqZ9R3TK0SuiI1BiqHC7M+RNL6qCBMnH 3JZefA+FnGrjEl+2tPJm4ztE4vooK0Eu50Cf+gD1A1bmL03cRoxa99cukruVay1Q/xf9t4 UxtLyx8RLSA5yLMLGwZ1/eE0jU4Ah9RnvieveY3deGhzsgkOrxz+jQqAOgGhvjdwfg+Nvu pPh6HnPDZJ39lo5WGMTe4xnUeE2XfrlYmNilial9J3SplU3wZUQhZIEXClWYGw== ARC-Authentication-Results: i=1; rspamd-85dcd79db4-nvj9m; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Thoughtful-Scare: 59a2ae6619892b03_1725398062026_4006913501 X-MC-Loop-Signature: 1725398062026:4027038621 X-MC-Ingress-Time: 1725398062026 Received: from pdx1-sub0-mail-a207.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.103.36.200 (trex/7.0.2); Tue, 03 Sep 2024 21:14:22 +0000 Received: from fedora.redhat.com (bras-base-toroon4859w-grc-66-76-71-1-128.dsl.bell.ca [76.71.1.128]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a207.dreamhost.com (Postfix) with ESMTPSA id 4Wyyzx2N4pzJj; Tue, 3 Sep 2024 14:14:21 -0700 (PDT) From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: fweimer@redhat.com, jeevitha@linux.ibm.com Subject: [PATCH] libio: Attempt wide backup free only for non-legacy code Date: Tue, 3 Sep 2024 17:14:02 -0400 Message-ID: <20240903211402.2266742-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1172.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_SOFTFAIL, 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.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org _wide_data and _mode are not available in legacy code, so do not attempt to free the wide backup buffer in legacy code. Resolves: BZ #32137 and BZ #27821 Signed-off-by: Siddhesh Poyarekar Reviewed-by: Florian Weimer --- Tested on x86_64 and i686 for any further regressions, and on i686 by running libio/tst-stderr-compat under valgrind. I could not think of a straightforward test case for the testsuite since the crash due to freeing _wide_data->_IO_save_base depends on data after _IO_FILE. I'm relying on, instead this problem to be caught in testing on old architectures, like it was with BZ #32137. Maybe we also need, e.g. a ppc32 trybot for pre-commit CI. libio/genops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libio/genops.c b/libio/genops.c index 35d8b30710..6f20d49669 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -819,7 +819,7 @@ _IO_unbuffer_all (void) /* Free up the backup area if it was ever allocated. */ if (_IO_have_backup (fp)) _IO_free_backup_area (fp); - if (fp->_mode > 0 && _IO_have_wbackup (fp)) + if (!legacy && fp->_mode > 0 && _IO_have_wbackup (fp)) _IO_free_wbackup_area (fp); if (! (fp->_flags & _IO_UNBUFFERED)