From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oo1-xc2e.google.com (mail-oo1-xc2e.google.com [IPv6:2607:f8b0:4864:20::c2e]) by sourceware.org (Postfix) with ESMTPS id 1C2093842ADD for ; Thu, 30 Jun 2022 13:56:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1C2093842ADD Received: by mail-oo1-xc2e.google.com with SMTP id o23-20020a4ad497000000b0041bd038b4dbso3760455oos.4 for ; Thu, 30 Jun 2022 06:56:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=hJa38JvNHph30xfNE8Ylr7bxrURA8yeBuNmpUiguMgo=; b=fv9HdYB5f2Aj/53+LHoICU9knCSB/Ilu4SSyKxjQTp+/JQ1L7pF+nqQ78Twtzt2HIh MWo8HDWc2pd3EmFxLmSwe9Kw4mRrH/k8/ygy9lQTOYvKQZQFPhSNzceogrfeOBN54K5m ImhVKp0MnORY0147BjCmZiWhGCEVD6Hf17IeGrq/iLJ2dp1+TBXN3ZgCS5aJU1HokP+H 6YaBKMBeLNKdynx0LwoR6XtwBJgP2JFdRk58bb4jcBPW6GqRt3DUcT6fADa0CcqRwoao IlfjvEj51K9gFKQpDl8u/RP4yPHy1I82NMZLBhmIz4G+uemJnJmLsiYGSqwmvRKLP4T/ hpDQ== X-Gm-Message-State: AJIora/2gFOwUvkrlpsGfWuSxEVOje/TY0hVf675sPW8I3md13F5iTAQ rGE6+tBy9n18COKw36mvhfzaJv+QqXpnyiS+ X-Google-Smtp-Source: AGRyM1sjTkx0uQsNkdRN98I6CYVREtbrDRG+DaGa5qbwvnNVQAv8S+qePIzLac1m/OCiyBRoIqsK4w== X-Received: by 2002:a4a:e757:0:b0:425:aa8f:8f48 with SMTP id n23-20020a4ae757000000b00425aa8f8f48mr3830713oov.87.1656597369277; Thu, 30 Jun 2022 06:56:09 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:fef6:d392:83c:dbc8:397]) by smtp.gmail.com with ESMTPSA id v202-20020acaacd3000000b0033326435494sm10017701oie.41.2022.06.30.06.56.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 06:56:09 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [COMMITTED 2.34] linux: Fix mq_timereceive check for 32 bit fallback code (BZ 29304) Date: Thu, 30 Jun 2022 10:56:04 -0300 Message-Id: <20220630135604.958903-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2022 13:56:11 -0000 On success, mq_receive() and mq_timedreceive() return the number of bytes in the received message, so it requires to check if the value is larger than 0. Checked on i686-linux-gnu. (cherry picked from commit 71d87d85bf54f6522813aec97c19bdd24997341e) --- sysdeps/unix/sysv/linux/mq_timedreceive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/mq_timedreceive.c b/sysdeps/unix/sysv/linux/mq_timedreceive.c index 7f3a112d7f..1fc98752e7 100644 --- a/sysdeps/unix/sysv/linux/mq_timedreceive.c +++ b/sysdeps/unix/sysv/linux/mq_timedreceive.c @@ -41,7 +41,7 @@ ___mq_timedreceive_time64 (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len { int r = SYSCALL_CANCEL (mq_timedreceive_time64, mqdes, msg_ptr, msg_len, msg_prio, abs_timeout); - if (r == 0 || errno != ENOSYS) + if (r >= 0 || errno != ENOSYS) return r; __set_errno (EOVERFLOW); return -1; -- 2.34.1