From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dormouse.elm.relay.mailchannels.net (dormouse.elm.relay.mailchannels.net [23.83.212.50]) by sourceware.org (Postfix) with ESMTPS id CE8743858D1E for ; Wed, 30 Nov 2022 11:47:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CE8743858D1E 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 DCD1864243F for ; Wed, 30 Nov 2022 11:47:56 +0000 (UTC) Received: from pdx1-sub0-mail-a221.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 31F6064223E for ; Wed, 30 Nov 2022 11:47:56 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1669808876; a=rsa-sha256; cv=none; b=XJH+2BloTWP6NyLvqMTlbqMMzHppCyzC7X0i5Jejus5FiNlc27ebHgFp+fhezd81zbluuw 8cSGv+jM+k2MUZIl29giMNq36AjmyIhVzJY5YI+BH+w/b6am4R1MEPAjjEdhfPMACt9qRR qGKJypUVaA8Q+laSEcwP0lYQeHOp87Znw3Wyo+PpjlKTMrOmvtXBF/wC/iY6pZMMq/GRuC czEAE7xtomy/RiLaE6qR1muU2AVckE7nMw6snOYJemgU/cN293EA41niip0gHIRDmIlemh shSBQFUDAhtVUYqKuHBN+U4dwVucGz//IO12ssix5k2MFmBFg6Ob8b+HdpjC1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1669808876; 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=/W9BGS6OjjpNlqUPsZNnYuZSpomjZ6nOlECstqC3R4k=; b=ITQc5apCyBHIe9jcFTLunWM02FCj03SVZGM6Vs7RDCQmTSTHWzxVfFX+S9yUurDEGvTvkO G3aU1BaD+mrvzyQfyURcdwvm4dXn+So0yIos9rdvj3rASEuKGN1ZFMHdGvAjArmJzRAYa7 ukOj+pq5tmLWptjD2pwY1QxFMRk6lpMzJbiyF7YiZHxQMT2/u8VXRsqdZBIAKipaQE1+p3 cf5ftenhp6FKFnyb/97kiiNyxHcPRI2dPF6wLxVEIASoG/HNxKMuyn9LUZzPFk4KFPFidg VNXZE/SS5n+VmKEOhB3iTyB6ZRtrFPMoaO4ZBqcTEdYAq+PapTgauAxoaehKzg== ARC-Authentication-Results: i=1; rspamd-7bd68c5946-jlqwv; 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-Cooperative-Bubble: 7384d012202d7f6f_1669808876452_2353637530 X-MC-Loop-Signature: 1669808876451:1640083635 X-MC-Ingress-Time: 1669808876451 Received: from pdx1-sub0-mail-a221.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.109.138.39 (trex/6.7.1); Wed, 30 Nov 2022 11:47:56 +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-a221.dreamhost.com (Postfix) with ESMTPSA id 4NMcs73SfvzGQ for ; Wed, 30 Nov 2022 03:47:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ascii.art.br; s=dreamhost; t=1669808875; bh=/W9BGS6OjjpNlqUPsZNnYuZSpomjZ6nOlECstqC3R4k=; h=From:To:Subject:Date:Content-Transfer-Encoding; b=kTodD6YDLBNY2pFvkSsCUnlWveOU1AQpnolda2tPgsvJtnEpsax/UpQQEezdth9C5 2NaN6gApWWkTdenmV/0wVO9h06kccYOWtx84pyRb4aIAd8Scb/jTnRYjgKatUSW1wL 2Sdm2N48Pg5GB/N2Q5J/Tf0ZzfA+SXk7aWCUsvEcJjc5zyN9MDTxgR8OV5Fo0IwokI sl5br+fk4inEiikzxQIlZ4KTJpmskLPRlFitnWwgUxyda81E+H2ikQi4WXWjwys3xB 46+yri0Jld3eUTjOLyYwZ9XPP6DM0fX2gjNiX/yce75I7tL476qPbakC3PZ2gM0y1+ Xi0sIdjPdjp4Q== From: Tulio Magno Quites Machado Filho To: libc-stable@sourceware.org Subject: [COMMITTED 2.35] Apply asm redirections in syslog.h before first use [BZ #27087] Date: Wed, 30 Nov 2022 08:47:06 -0300 Message-Id: <20221130114706.2001300-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,RCVD_IN_MSPIKE_H2,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 fd30dd3114..916d2b6f12 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