From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from brown.birch.relay.mailchannels.net (brown.birch.relay.mailchannels.net [23.83.209.23]) by sourceware.org (Postfix) with ESMTPS id EE33D3858C52 for ; Mon, 18 Apr 2022 05:15:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EE33D3858C52 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 7AC0AC0F2E; Mon, 18 Apr 2022 05:15:40 +0000 (UTC) Received: from pdx1-sub0-mail-a306.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 0E75EC0EF7; Mon, 18 Apr 2022 05:15:40 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1650258940; a=rsa-sha256; cv=none; b=9eHLJwLDVqPfiWQyVouBUFEHcklH6X7du2N/qcoOZtqaHIyn7GZMa3wiPC29e8FtgTXfBJ 2AuESfguPHVRzZtx2oMy5rlYfQ1OrDNjJzyDUL0FSYl7SlQL9c4HhDXTWd1HAc9HamdHtg pbM/QsCESfHD/ifVdJ3h3iS08g6omGjvCq6xLaB5RJ5ML3zgnA0f2I4LerC73LjFUiYXgc cbf8sSvFrm2/pPi+ij54FQ+d1sa6JxckU277plT00T6H5TeJ+zm6IOs00BZAzOFh3uA6JQ KdBQI+n7cNDgHnavtJ07qKTmfKZoi2I5EOR4yBmziiNDbKLFhIEVy1rewocvTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1650258940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yGb4Up/M/Ej08oP+hf4oULIMY023LctuEmjhM32VQzQ=; b=NGBFJfkJ3DGOKOodN+a+5m0kezj+CSGQZ97SiKqBJ3Btvg/akwUQqm4jErJjFAqhUpdgoh tNTNtpowVmFMWwFcednLwOMR76mOo9lVAPYVWclI6uLFXzaALNvNdWGMe/kcl56AEE267P oxESfngBJ8axZPnqZQKwfRpSfesuqwLUumBYwiYDYw5blZCNwsACQvu5N2kgRJl2pW68ZV v9dJbZenBYLdrZmibdqJcokrMa+ZAgyK+MJsjJPrkKNHXFDl1d30YFquXdBMtC4zZlXS4U 2sxQQU6+Y1ylT4FOTFpCeUXLcI4X3ixJFwxVSEvOQ3Z2X+UbAkPw8h6451YV1Q== ARC-Authentication-Results: i=1; rspamd-b69d6888c-zzjgc; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a306.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.125.123.25 (trex/6.7.1); Mon, 18 Apr 2022 05:15:40 +0000 X-MC-Relay: Junk X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Thread-Scare: 2572e54b3b049a11_1650258940382_71503471 X-MC-Loop-Signature: 1650258940382:2074071688 X-MC-Ingress-Time: 1650258940382 Received: from [192.168.1.174] (unknown [1.186.223.62]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a306.dreamhost.com (Postfix) with ESMTPSA id 4KhZrp4P60z2t; Sun, 17 Apr 2022 22:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1650258939; bh=yGb4Up/M/Ej08oP+hf4oULIMY023LctuEmjhM32VQzQ=; h=Date:Subject:From:To:Content-Type:Content-Transfer-Encoding; b=kvhib16KPBglvX6kX2aJ+AIGRyQ2ly3rPHfvHPmTUydmY/l7aFpJ7dU+W3gJNGKom I/U7pynr7JOgmRRbB/ok2Fngrlye2sJr3IaKw1rbwSBCzBgfFvTjKGVAoY0Yew1cMN iTdpPAJ/II6BeWLBIJHl8zCIokEEC2c3z6Ot0DF9bvxkkDh5JOT5kOQYgkyT1DXQ2j eeNXb161DE1rUyENdo/x3v50qWywcvGvIyVuYN7iERU5gUN6Eks6bzx8KWCxLEBM2k 6zsFD7dsU2vxfHT057x1mFOL8hWE5/KVe9OIPXMcESvtFXs60zam4rXmSEyfhJLTaY KP7GJU6JBi9fA== Message-ID: Date: Mon, 18 Apr 2022 10:45:33 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH] misc: Fix rare fortify crash on wchar funcs. [BZ 29030] Content-Language: en-US From: Siddhesh Poyarekar To: Joan Bruguera , libc-alpha@sourceware.org References: <20220411174956.2657622-1-joanbrugueram@gmail.com> <56718a77-f902-9fc3-27a0-8b1a27698794@gotplt.org> In-Reply-To: <56718a77-f902-9fc3-27a0-8b1a27698794@gotplt.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3035.3 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Mon, 18 Apr 2022 05:15:44 -0000 On 18/04/2022 10:14, Siddhesh Poyarekar wrote: >>         cp = "A"; >>         if (mbstowcs (wenough, cp, 10) != 1 >>         || wcscmp (wenough, L"A") != 0) >> diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h >> index 44d3826bca..b8419e7e6c 100644 >> --- a/misc/sys/cdefs.h >> +++ b/misc/sys/cdefs.h >> @@ -156,14 +156,14 @@ >>      variants.  These conditions should get evaluated to constant and >> optimized >>      away.  */ >> -#define __glibc_safe_len_cond(__l, __s, __osz) ((__l) <= (__osz) / >> (__s)) >> +#define __glibc_safe_len_cond(__l, __s, __osz) \ >> +  ((__osz) == (size_t) -1 || ((__l) <= (__osz) / (__s))) > > This should go... > >>   #define __glibc_unsigned_or_positive(__l) \ >>     ((__typeof (__l)) 0 < (__typeof (__l)) -1                      \ >>      || (__builtin_constant_p (__l) && (__l) > 0)) >>   /* Length is known to be safe at compile time if the __L * __S <= >> __OBJSZ >> -   condition can be folded to a constant and if it is true.  The -1 >> check is >> -   redundant because since it implies that __glibc_safe_len_cond is >> true.  */ >> +   condition can be folded to a constant and if it is true, or >> unknown (-1) */ >>   #define __glibc_safe_or_unknown_len(__l, __s, __osz) \ > > here since the above macro is "safe length condition" and this one is > "safe or unknown length", so the unknown length check ideally belongs here. Sorry I missed another note, please use __SIZE_TYPE__ instead of size_t to avoid having to include stddef.h. Thanks, Siddhesh