From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from black.elm.relay.mailchannels.net (black.elm.relay.mailchannels.net [23.83.212.19]) by sourceware.org (Postfix) with ESMTPS id 194B73858C2C for ; Tue, 29 Nov 2022 22:19:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 194B73858C2C 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 69C8B5C14D3 for ; Tue, 29 Nov 2022 22:19:33 +0000 (UTC) Received: from pdx1-sub0-mail-a246.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id CB5605C11AD for ; Tue, 29 Nov 2022 22:19:32 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1669760372; a=rsa-sha256; cv=none; b=Xnp0Fsr4Qb9MkCdZwSMNOd9ohn6WHIoNKGYKbYFatoYHxkiaP/SdNjrnwBYaSk1gU8OYoY p7Hh32gyaLyK1v01uwe1wtUKMrSsbehGfhGApQZSmniOtPJe0wrxk+o0H9nr3lg0eK48m9 8iHqooYTR3XnqzqDK5VKG/9wvHWx6y+3gP4GltidWRBQQZh5YE33GqvQsDvZKB6lkyd0Ii XxYrS/hqQnDGvC3cocTf/vr+XJxTna9khOOX/tJFcRCcBNHr4kvpX1lYe7CT0dfYgP4yC6 n4Enq+PFNLf7vyipggmWwjqn75kjqlYuzJ4dJJnH31Zrk0LDTeKeJl6itq6bIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1669760372; 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=L+ho68W+JI4WZmm1UEbExdI58NAek3K8d5hJ/et/vLg=; b=CB4wa3oY3HDBieRPcboDwAmXc2R4L1oT6LGwNE8Gur9fShK31cVG7DV0ZDX+UYOQyvtu1R RcEQqjMm2+N8hv96s9IpfJUQ/cejv+IdVi/lVvmB2g+1pMpQH2xXk7nwEw0fzQpuno1Lin PtGx50Ng/+nu0/L7vZ38EHxzeah5edAJYlgdWQ8MqATZX3nJ426ExlvooRUGWjRkb1PwWj S4tMVq+qrixdsfyR6GrEbUzdpyGiKPCfE4XkLNMV0rjENfM9EN2MuSfzTIR0tzEkHCItNt 7ZtkshpPWzbIFLqqOgO6lBzCgyidRi3e9qy2WfkMykv7+rSxsqe6QHee4frRnA== ARC-Authentication-Results: i=1; rspamd-84789cff4b-zdwrc; 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-Shade-Hysterical: 6e10dee004d5b01f_1669760373076_913324383 X-MC-Loop-Signature: 1669760373076:1658847440 X-MC-Ingress-Time: 1669760373075 Received: from pdx1-sub0-mail-a246.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.99.229.54 (trex/6.7.1); Tue, 29 Nov 2022 22:19:33 +0000 Received: from ascii.art.br (unknown [181.225.181.83]) (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-a246.dreamhost.com (Postfix) with ESMTPSA id 4NMGwN1CY3z68 for ; Tue, 29 Nov 2022 14:19:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ascii.art.br; s=dreamhost; t=1669760372; bh=L+ho68W+JI4WZmm1UEbExdI58NAek3K8d5hJ/et/vLg=; h=From:To:Subject:Date:Content-Transfer-Encoding; b=Eu31Ac0rA5sGEsmucs7TYK72zlXZ97eajg9HO9oKV14lTVBSenRUsi6jw6eLI9Jh6 VT6cZPUPQsgMqIcATb7SMXJgsgLokIkCIDssPLTmZcq/6hPhPdNIMGfk8wVzRMWGOt obBJ4Hf+tx7BP24sRj5pnKBWl/3L4rJQ+HXBDwGiwiL5+mkpgBaODOO/BVsg3mBnCo eqBelG5KhWTt0I90mFHBCe+6QDM04y5kyfEwmrrdogVKUi4qXg/2FEuR4Pb685rVcN 7ttyM+gdR3C0SN/3x35HPJQIYLotMbVKVM7iO3y7Wn6OQi7TPurfDNO633GVYkb28N Rq7JbY0TIGDBw== From: Tulio Magno Quites Machado Filho To: libc-stable@sourceware.org Subject: [COMMITTED 2.36] Apply asm redirections in syslog.h before first use [BZ #27087] Date: Tue, 29 Nov 2022 19:19:15 -0300 Message-Id: <20221129221915.289033-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=-9.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 d933fea104..3888153ed2 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