From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by sourceware.org (Postfix) with ESMTPS id E1E113842ADD for ; Thu, 30 Jun 2022 13:57:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E1E113842ADD Received: by mail-oi1-x231.google.com with SMTP id be10so26126207oib.7 for ; Thu, 30 Jun 2022 06:57:57 -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=52fBP1iCv+YFZW6SegT68NkJdnQa4QmeZEWzzUIDuMw=; b=lUGTTpU0VLy8vu0djnexj5xwbQdMzzPhPlm8HSZpbaj/NkQGx/YxzLbCnr2AVO54Vq Qrdef1wqz77Axiy5LYXecZRF8iLhqd4X2Agpdq9oQSAMNK7JPVRKi4R6YQyDEZutiCt1 3bh87Wjx/BKw4Rlh1JTNUi8NjSNejyF4y8TqFwE9VohmuQcBo1DX3QRUiEq90fvcRHdv bvusFgT5sWLcBaPYMYBWQ94RlWOi1R0Ea3eBoiwZm5uQloLA7MqxKOEstV18jAJ31edz czRFjxtjEoaM9RZ3sSoWPIzOJS++UrBLTzplv2ac/Dnm+hbRnqJJfkUBwY06aDK4NLIA YKnw== X-Gm-Message-State: AJIora/q8gYMNoK529R2HLNzR3+XQ2peGOBiayggGN6HvYf1iy62H+NW RW7iSdO6/BfDaxefmgHgkeNeN2wYVSO1AlOe X-Google-Smtp-Source: AGRyM1u48wmc/hjtm906A2pfCHxOJIk236w1J5d9YXDiN1jYjMnPeoGHLCnQhf2Hgw26P2pX7wZbag== X-Received: by 2002:a05:6808:120c:b0:325:731e:923 with SMTP id a12-20020a056808120c00b00325731e0923mr6602400oil.155.1656597477176; Thu, 30 Jun 2022 06:57:57 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:fef6:d392:83c:dbc8:397]) by smtp.gmail.com with ESMTPSA id bl29-20020a056808309d00b0032ed2343100sm10416948oib.14.2022.06.30.06.57.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 06:57:56 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [COMMITTED 2.32] linux: Fix mq_timereceive check for 32 bit fallback code (BZ 29304) Date: Thu, 30 Jun 2022 10:57:54 -0300 Message-Id: <20220630135754.959318-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:57:59 -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 728a63d1ec..fda57be19d 100644 --- a/sysdeps/unix/sysv/linux/mq_timedreceive.c +++ b/sysdeps/unix/sysv/linux/mq_timedreceive.c @@ -35,7 +35,7 @@ __mq_timedreceive_time64 (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len, #else int ret = SYSCALL_CANCEL (mq_timedreceive_time64, mqdes, msg_ptr, msg_len, msg_prio, abs_timeout); - if (ret == 0 || errno != ENOSYS) + if (ret >= 0 || errno != ENOSYS) return ret; struct timespec ts32; -- 2.34.1