From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cheetah.ash.relay.mailchannels.net (cheetah.ash.relay.mailchannels.net [23.83.222.34]) by sourceware.org (Postfix) with ESMTPS id 661003858D1E for ; Wed, 30 Nov 2022 16:38:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 661003858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=ascii.art.br Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=ascii.art.br X-Sender-Id: dreamhost|x-authsender|tuliom@ascii.art.br Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 9518E5C2550 for ; Wed, 30 Nov 2022 16:38:13 +0000 (UTC) Received: from pdx1-sub0-mail-a211.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id C40E85C22EC for ; Wed, 30 Nov 2022 16:38:12 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1669826292; a=rsa-sha256; cv=none; b=A6+gb7E8WfSDcW8TvQZMtOo7ONKifYESRqhNARuG49zzsMJ6RGzGRt5NNmxBSK4SQ8UMB/ 5QoMAYJq7kTiiIwTq4erRVrlx79HisuplzPL4M9K09r3f7QwhWYmxA8EyhBmkUt24fUCCA QrNrdtyqlCAhWr7/Z9SiOj4zTl/wboZB/e/zpAxLBniaxrAWHZquwHJyxSXL57OMZmpcCE aKfCuBmEo8myzqb3ulfYbdLUZou862g38Hy2oo+2fC027ITnrWYLwlrxt4sb3ERP9rUdUi TPxJjNqvm7QnDp1bVXX8n1wdiE1XIKBAOXNQj4QbEZMsMu3W8j2Shc6pUuIcBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1669826292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=pWwRMQaIkowg+Y0BQKpMVSg6Yo2AT1VOo+omqh8ZlQA=; b=giPvftvhBowbndnyCVCkwmGatSeG2efnErg5HdQwQzHlsvzh49htg+GaMgPu9Ao+wPOzCy SZQDkuTXdZS4iT6d4rBOGe9C7pS9WUN+5+OfJ/Hnk8NpUQYRGfFyYY7QfqyKADqjS1eOnN /210cKqopEg23gT98MkQWQxjiafuKLdOeVeqhMRxo/bwy0P0uJZGU0f7otXQxYEZCKXYh2 tkBoH4j5f+VqnFXQxtqDbRcOYt+fPvF2P3rPhfS6+szzNY/791xkiOdOLDBh3R3+uKk0cO LhOBPjHbPrm7QcecMrwHoHxxHGX/pdg05vG3Ns4srcJFuW0BH19IFB6e5/OxaQ== ARC-Authentication-Results: i=1; rspamd-84789cff4b-f9hb7; auth=pass smtp.auth=dreamhost smtp.mailfrom=tuliom@ascii.art.br X-Sender-Id: dreamhost|x-authsender|tuliom@ascii.art.br X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|tuliom@ascii.art.br X-MailChannels-Auth-Id: dreamhost X-Befitting-Befitting: 443beb2a4053592e_1669826293022_1870995072 X-MC-Loop-Signature: 1669826293022:2117146268 X-MC-Ingress-Time: 1669826293022 Received: from pdx1-sub0-mail-a211.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.123.200.112 (trex/6.7.1); Wed, 30 Nov 2022 16:38:13 +0000 Received: from ascii.art.br (unknown [186.216.129.64]) (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: tuliom@ascii.art.br) by pdx1-sub0-mail-a211.dreamhost.com (Postfix) with ESMTPSA id 4NMlJ41XHLz21 for ; Wed, 30 Nov 2022 08:38:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ascii.art.br; s=dreamhost; t=1669826292; bh=pWwRMQaIkowg+Y0BQKpMVSg6Yo2AT1VOo+omqh8ZlQA=; h=From:To:Subject:Date:Content-Transfer-Encoding; b=FDG8rSU7g0Y08cy9wWXWAlJ+a/lG/8OKRotS76f+Fr8g5oOzsazcEPha+xeTBZBgM /fEc6Ly3wOM+9Mwgc5hgfrhMSwIvJHe1zq3yYY6u3Jc/QCgTLHQk8ZSv1CmYBMkzL4 F+QiIh+j92ICVpnkxgy02kBeJ6lZAaorH498LKep0CHuMKO5Zu8Bk63iYMd2yrlnhZ UyangYncQokuZoph1W15Who4KYwF/xS89foFiTaNLUj53wSheuCeCEc/82eTCfPTEU Xy6QD4qKkrp3lROp1AF/BSLYtgdEAdnSxnAUfoJoUwGGYvoJxk7NxFb4VgfDsURUEL mPyIIK0rMAvMw== From: Tulio Magno Quites Machado Filho To: libc-stable@sourceware.org Subject: [COMMITTED 2.34] Apply asm redirections in syslog.h before first use [BZ #27087] Date: Wed, 30 Nov 2022 13:36:40 -0300 Message-Id: <20221130163640.2022378-1-tuliom@ascii.art.br> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_BARRACUDACENTRAL,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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 List-Id: From: Tulio Magno Quites Machado Filho Similar to d0fa09a770, but for syslog.h when _FORTIFY_SOURCE > 0. Fixes [BZ #27087] by applying long double-related asm redirections before using functions in bits/syslog.h. Tested with build-many-glibcs.py. Reviewed-by: Adhemerval Zanella (cherry picked from commit 227df6243a2b5b4d70d11772d12c02eb9cb666ca) --- misc/bits/syslog.h | 18 ++++++++++++++---- misc/sys/syslog.h | 10 +++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/misc/bits/syslog.h b/misc/bits/syslog.h index 6f3137a98e..10c9c11513 100644 --- a/misc/bits/syslog.h +++ b/misc/bits/syslog.h @@ -24,6 +24,20 @@ extern void __syslog_chk (int __pri, int __flag, const char *__fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4))); +#ifdef __USE_MISC +extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt, + __gnuc_va_list __ap) + __attribute__ ((__format__ (__printf__, 3, 0))); +#endif + +#include +#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 +# include +#endif + +/* The following functions must be used only after applying all asm + redirections, e.g. long double asm redirections. */ + #ifdef __va_arg_pack __fortify_function void syslog (int __pri, const char *__fmt, ...) @@ -37,10 +51,6 @@ syslog (int __pri, const char *__fmt, ...) #ifdef __USE_MISC -extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt, - __gnuc_va_list __ap) - __attribute__ ((__format__ (__printf__, 3, 0))); - __fortify_function void vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap) { diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h index dc3b0e7ef8..e7a98fb9b1 100644 --- a/misc/sys/syslog.h +++ b/misc/sys/syslog.h @@ -205,11 +205,11 @@ extern void vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap) /* Define some macros helping to catch buffer overflows. */ #if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function # include -#endif - -#include -#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 -# include +#else +# include +# if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 +# include +# endif #endif __END_DECLS -- 2.38.1