From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2f.google.com (mail-oa1-x2f.google.com [IPv6:2001:4860:4864:20::2f]) by sourceware.org (Postfix) with ESMTPS id 0D7393842AF8 for ; Thu, 30 Jun 2022 13:55:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0D7393842AF8 Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-fb6b4da1dfso25900476fac.4 for ; Thu, 30 Jun 2022 06:55:28 -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=dTLP/L+a5/ooV3NiiR3no5mKNxnPfGSYJvO4agct9yY=; b=fvVhzykKOjDf6Bs+3MFp51GKSQ8mz8ovXNACxxWASXrmNyCiYmGwzwxoBBRhDBIFx1 DY13mR5hZb5ZsAstiCytARqHD0ujWZaZ8tslxivIzdqy0iEyWL5mDI0/URtNp/ajbIYk JfsuZcULOpIDrKN+HOBePAk2h+Tb+/ZdoENg8IMfNQ8zV0ZFIoFc/PmIXvq9k18Ba/sj SoNOXsUlbRG3gVW4q8AhjbklBS9CQw1navPBk5keTJy0bztbRRoMzOdWlWDiJvMZFopv FmgLTEt2L0C8Jl4ZWa/njcn5HqXLmnVXgPk9tly6pUS1s1883x9oXhfaRLh0lUe/2Xy/ pzMA== X-Gm-Message-State: AJIora8negi6FrLYXqd7MmvvM6sSWxxnNW8CTYc93XHWJOpRkLUtFL92 Yvp7YRaie/HOT09LpnuZ1i2uDFLcBjpXgyeq X-Google-Smtp-Source: AGRyM1to1rW/OKmqaTHgSZqQrVfXc4jh7LxcJnVz6FgiKM+C6udJfYtWpyJaN3uCW4RJ9udJrVAxIA== X-Received: by 2002:a05:6870:a78f:b0:101:d05b:fa3f with SMTP id x15-20020a056870a78f00b00101d05bfa3fmr5265269oao.221.1656597327207; Thu, 30 Jun 2022 06:55:27 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:fef6:d392:83c:dbc8:397]) by smtp.gmail.com with ESMTPSA id bl29-20020a056808309d00b0032ed2343100sm10413397oib.14.2022.06.30.06.55.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 06:55:26 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [COMMITTED 2.35] linux: Fix mq_timereceive check for 32 bit fallback code (BZ 29304) Date: Thu, 30 Jun 2022 10:55:19 -0300 Message-Id: <20220630135519.958746-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:55:30 -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 834cd7a484..5bf1e0a83b 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