From patchwork Tue Dec 29 20:24:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 41590 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 D78243854815; Tue, 29 Dec 2020 20:24:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D78243854815 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1609273463; bh=SHZtD8LMyR54KeyHJsFnqtBpDEJRzpOXqIKrj/GgPhI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hI8ONk5zjvPOVTROe9nJeWhh40o4OSP7ulGf/7rDBtZ+2+XwnxFaITSMwOw0NbeQ5 yhGks2zkG98kFQZmIdVsfmgDA2b4XobzVgzDlfN9Fyg2JviJTDfSL3xUVqZXZihIiP GUZBR8e3jDk4KBWsMG0Vkq2sFhNevxDXVxIHP+xA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) by sourceware.org (Postfix) with ESMTPS id D84683857C69 for ; Tue, 29 Dec 2020 20:24:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D84683857C69 Received: by mail-qv1-xf29.google.com with SMTP id h16so6853264qvu.8 for ; Tue, 29 Dec 2020 12:24:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SHZtD8LMyR54KeyHJsFnqtBpDEJRzpOXqIKrj/GgPhI=; b=frsrlYW/O8BaO5+KJFN1wb9NF5a9QumdPTLuNQgEZH9j3cc43kB6aMVM0W2fM8lVjW /wBpMyTZ6lpmT/os2zH/OGjoF3kzRM4Mfo0wJta+5AJZnWtf2g4WbDpcj8tttl2+U+Ua 5g8IvZFTMohGVB1ot3I00arx27s/IHrUTd4h/1VCmPWsCzXVWT4Xhu3NkqP1Ns/NbJ6I iPbUO32cZiLWNlz8sVvs0XArvg9aTR91MNryQU+KRBYzinp+bUr3Xik+MzjI6VXMHLCf BVPRiiER9TFt9ERK8IJADaXzc1TxV5fBDlUSJqDO+7mRyRvSXtlsRKqfpKDLZnuTOf4N dQ5A== X-Gm-Message-State: AOAM5324RE3n2BVFK33g53jE8xTQEDUMhrdy+01zVULQlD/+TK+dx9mg IPh5ryrLtfBYUmrdY6UjxQ3zXzyRRjQQkg== X-Google-Smtp-Source: ABdhPJyYlstCo+xIgADxijfIvoGiJbVHDrj4EkXHDPAe7l45sMCVL86Y/w5BbDbjhWHMo1FTdvl7RA== X-Received: by 2002:ad4:59d2:: with SMTP id el18mr52220450qvb.35.1609273461242; Tue, 29 Dec 2020 12:24:21 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id t5sm25725387qte.20.2020.12.29.12.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 12:24:20 -0800 (PST) To: libc-alpha@sourceware.org, Paul Eggert Subject: [PATCH] malloc: preserve errno on mcheck hooks [BZ #17924] Date: Tue, 29 Dec 2020 17:24:16 -0300 Message-Id: <20201229202416.432569-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Similar to the fix 69fda43b8d, save and restore errno for the hook functions used for MALLOC_CHECK_=3. It fixes the malloc/tst-free-errno-mcheck regression. Checked on x86_64-linux-gnu. --- malloc/hooks.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/malloc/hooks.c b/malloc/hooks.c index 6474ba8b38..fc285f15c6 100644 --- a/malloc/hooks.c +++ b/malloc/hooks.c @@ -260,6 +260,8 @@ free_check (void *mem, const void *caller) if (!mem) return; + int err = errno; + #ifdef USE_MTAG /* Quickly check that the freed pointer matches the tag for the memory. This gives a useful double-free detection. */ @@ -274,12 +276,16 @@ free_check (void *mem, const void *caller) { __libc_lock_unlock (main_arena.mutex); munmap_chunk (p); - return; } - /* Mark the chunk as belonging to the library again. */ - (void)TAG_REGION (chunk2rawmem (p), CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); - _int_free (&main_arena, p, 1); - __libc_lock_unlock (main_arena.mutex); + else + { + /* Mark the chunk as belonging to the library again. */ + (void)TAG_REGION (chunk2rawmem (p), CHUNK_AVAILABLE_SIZE (p) + - CHUNK_HDR_SZ); + _int_free (&main_arena, p, 1); + __libc_lock_unlock (main_arena.mutex); + } + __set_errno (err); } static void *