From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2d.google.com (mail-oa1-x2d.google.com [IPv6:2001:4860:4864:20::2d]) by sourceware.org (Postfix) with ESMTPS id 78D923858D20 for ; Tue, 8 Nov 2022 13:58:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 78D923858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-13c569e5ff5so16318150fac.6 for ; Tue, 08 Nov 2022 05:58:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=7I+LpdoLNjWK4Q0CoP9OmbaYIcJByq3OlhQ9hLz0NtM=; b=jm1CYD7J9jIOMsh1dF2Zs/WPXz4Ap3RR5hrkBpivwOLZu0NdEnAu83UfxKooDW5C5i 3mkiI09FZw2+MfGnxXU5AEvEgILxvKq7592xB4Fru12KfpqNzPH08cZPJByQy6YO67aY KH/gV63dRSOQpHb1hfNJKL2n6irnLcKsjedLaLDqLDvUy+Iu2q5EQK2jp3MdlAFcENdk 8eHH/8XWKwLTh+0M+YwW7PEfIM+/dmcYY93W8KbmsmRGBeVUGfGCo9Hw5LNmDw2u952o 6mHT3jIKn1UUVXT8Q3nmRn+8ABl+apiyiCqMcD5l+C6ijuCMYaLXtBBHvbk8wHUGfmjN KwgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7I+LpdoLNjWK4Q0CoP9OmbaYIcJByq3OlhQ9hLz0NtM=; b=V62w+e17Q/limy3dn1j2ayeZxmGkN69pN4TzgC6klR/WHpP+ivu7hFeuTplF+jchKJ eoB3tUYRuDkzJ9gmQuJXhanu8suLCJDtvC8jzKzUeChaB3ilZ6egEwaMS3+pKwm0emgj 4j4F+g4+Wzbms/l0oAH9S/0bifLpu3c3YxT9hbsP8LZ6J8ucVju35xMFW/QBEjCZOC7Z Bb1mGq988Yi6du7AMqO6yZ5HQyE6LtN9Q8kTGofNi+jBy7SyuoNP2xnGlGp0nieqxx0U NoFg/TUJSGZ1zCnXb6ezieWI/LtFmENdCxxX9WPEItqdbnF6AULtGmgtG4IZnPyOQQZu Fz8A== X-Gm-Message-State: ACrzQf1t1JuNSGWlqs8Vvf/iLY+yjnm5ueA0yD1en+/Hz9lsLZyZjazy 8sqHx3taUpKZXkQy/6f27X1c7g== X-Google-Smtp-Source: AMsMyM4TZP0AhD8JLNlOcuAGL45Ybve7nyBeTltEe2f5sjsYiKVHgH50xpFnxTybam5tIneEpCy8Ig== X-Received: by 2002:a05:6870:8895:b0:136:ea9f:81b6 with SMTP id m21-20020a056870889500b00136ea9f81b6mr42846701oam.36.1667915902705; Tue, 08 Nov 2022 05:58:22 -0800 (PST) Received: from ?IPV6:2804:1b3:a7c0:a9f4:7d29:e035:dbf1:661f? ([2804:1b3:a7c0:a9f4:7d29:e035:dbf1:661f]) by smtp.gmail.com with ESMTPSA id s16-20020a4adb90000000b0047f72b6988fsm3176174oou.45.2022.11.08.05.58.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Nov 2022 05:58:22 -0800 (PST) Message-ID: Date: Tue, 8 Nov 2022 10:58:19 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [PATCH v3] Linux: Add ppoll fortify symbol for 64 bit time_t (BZ# 29746) Content-Language: en-US To: Andreas Schwab Cc: libc-alpha@sourceware.org, Kabe References: <20221108131525.1070162-1-adhemerval.zanella@linaro.org> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,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: On 08/11/22 10:28, Andreas Schwab wrote: > On Nov 08 2022, Adhemerval Zanella wrote: > >> diff --git a/include/sys/poll.h b/include/sys/poll.h >> index f904e21f89..af032048e4 100644 >> --- a/include/sys/poll.h >> +++ b/include/sys/poll.h >> @@ -2,16 +2,22 @@ >> # include >> >> #ifndef _ISOMAC >> +#include >> + >> extern int __poll (struct pollfd *__fds, unsigned long int __nfds, >> int __timeout); >> libc_hidden_proto (__poll) >> + >> libc_hidden_proto (ppoll) >> >> # if __TIMESIZE == 64 >> -# define __ppoll64 __ppoll >> +# define ppoll64 ppoll >> +# define __ppoll64 ppoll >> +# define __ppoll64_chk __ppoll_chk >> # else >> # include >> # include >> +# define ppoll64 __ppoll64 > > Why do you need that indirection through the ppoll64 macro? > Indeed there is no need with the change below: diff --git a/include/sys/poll.h b/include/sys/poll.h index af032048e4..5555fa2cee 100644 --- a/include/sys/poll.h +++ b/include/sys/poll.h @@ -17,7 +17,6 @@ libc_hidden_proto (ppoll) # else # include # include -# define ppoll64 __ppoll64 extern int __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout, diff --git a/sysdeps/unix/sysv/linux/ppoll_chk.c b/sysdeps/unix/sysv/linux/ppoll_chk.c index e8115623e6..65c4b56671 100644 --- a/sysdeps/unix/sysv/linux/ppoll_chk.c +++ b/sysdeps/unix/sysv/linux/ppoll_chk.c @@ -26,7 +26,7 @@ __ppoll64_chk (struct pollfd *fds, nfds_t nfds, if (fdslen / sizeof (*fds) < nfds) __chk_fail (); - return ppoll64 (fds, nfds, tmo, ss); + return __ppoll64 (fds, nfds, tmo, ss); } #if __TIMESIZE != 64 Do I need to send another version or are you ok with this one with the above change?