From nobody Sat Aug 19 00:35:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSKXr37ynz4fy4S; Sat, 19 Aug 2023 00:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSKXr2Xlfz3FnD; Sat, 19 Aug 2023 00:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692405356; 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; bh=CQgOiI+buD1Hy8d/y+2vO+Ri1JRzwWaqfZiwXL8rYsI=; b=YAtsmL2TZ3Ibdl9lmDlZVvqCNqs9iV6/qNAHqAfgthY7Qnmv6NUUK1iP6a0lm7RqSz4d52 bq0rGPuyEh70InvOvJ83PyAHLZInL/kbk7nxKpxr1qWEZbHsKZGqWKxpi/WkBETUo2W4yy EGOr/aLaKsXFpV8ZlKRVS4qNyeA1IL2SsHWqUh8ft0dsXiIfEq1pie1zr1eWhh7Y9PBFqU UiXAOMLL0jRXOAd2VWEFHWqp1qRISYBZngpjPkrDTkso9kkl3LvoGMOti8e3Xbf5yZIwhw XNX3ZlTaz0RVE5it5Cbxc2OvUksKEmxacl2kcS2z7TbDcfvJarHcvMspYY5ZwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692405356; 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; bh=CQgOiI+buD1Hy8d/y+2vO+Ri1JRzwWaqfZiwXL8rYsI=; b=aMcCOYpRRZ8sivpJWo9fsiuLel5iRLC4GLyjFT+ZHICtpqA2aFSOUI8NxcjdIVHXN2CTe4 Oj1zZYmJcw4K7xX0JkXfCS1wef8XYOUeHdULQWiblsxIG1nO2DIZY3eTwgziKKmEEpymY4 TsprsPU5U/k++BCM4+UGIHYCKuml0uTiAQR0MtAKZUVr2zYIAHyztH9+18Gt79LjfXetc+ cp8lhajoZefPaPLVDW1QimdHgkcnFfZH/HAs33usolOaYKL4l1rEi4fP6YmmUz99eu3Xd5 tEhPI4/dzzKTC5c3p8VxUxHF/yLHOlynwntxcvbWSKqbGDC0KUurh5Qqs8XlwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692405356; a=rsa-sha256; cv=none; b=BuZIHIAZ1B44Ve52SW0FwsCgxgVp4TNOb6t/HSXMk/GPMya40j25FrkgObe8hHd3VyT9kV V3RNzshfxVQZ+N8zs/73kEkxpg6xMa6pR9Z+rk/KJdzMYA9VG8mne4Im5toAJDXKLsXVkE jnlUwdnPVp5GtjbgjGJHNdHAVVtGeA9e4IElQIrVv8nYPjbOpmcW2lkQCyDGoXlh/8MJ1V H7LbJ3DJ84hobTKT+FF879TP1qX9yjfmetutazGtzxTcxfu2P0vvxM+2e7j0nw5WSdVHTd VH00qz0HsJn4PkqDRXxYCWcjR6g2OQNbGYoeCYizz9o04+6ldv2vWKXBNXBaCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSKXr1bL9zd6K; Sat, 19 Aug 2023 00:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J0ZuWb050582; Sat, 19 Aug 2023 00:35:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J0ZuLn050579; Sat, 19 Aug 2023 00:35:56 GMT (envelope-from git) Date: Sat, 19 Aug 2023 00:35:56 GMT Message-Id: <202308190035.37J0ZuLn050579@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3b6a41e84994 - stable/13 - libc vdso time functions: correctly convert errors into errnos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b6a41e84994350767335a3e008f1a02a628689f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3b6a41e84994350767335a3e008f1a02a628689f commit 3b6a41e84994350767335a3e008f1a02a628689f Author: Konstantin Belousov AuthorDate: 2023-08-12 15:45:43 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-19 00:35:29 +0000 libc vdso time functions: correctly convert errors into errnos (cherry picked from commit 41acfee690da6289d570338e6365c1d7ef61dad5) --- lib/libc/sys/clock_gettime.c | 6 +++++- lib/libc/sys/gettimeofday.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/clock_gettime.c b/lib/libc/sys/clock_gettime.c index ec8ec13a754d..b2a414455245 100644 --- a/lib/libc/sys/clock_gettime.c +++ b/lib/libc/sys/clock_gettime.c @@ -48,7 +48,11 @@ __clock_gettime(clockid_t clock_id, struct timespec *ts) error = __vdso_clock_gettime(clock_id, ts); else error = ENOSYS; - if (error == ENOSYS) + if (error == ENOSYS) { error = __sys_clock_gettime(clock_id, ts); + } else if (error != 0) { + errno = error; + error = -1; + } return (error); } diff --git a/lib/libc/sys/gettimeofday.c b/lib/libc/sys/gettimeofday.c index 22177b15a5c7..d955aaa907e2 100644 --- a/lib/libc/sys/gettimeofday.c +++ b/lib/libc/sys/gettimeofday.c @@ -44,7 +44,11 @@ __gettimeofday(struct timeval *tv, struct timezone *tz) int error; error = __vdso_gettimeofday(tv, tz); - if (error == ENOSYS) + if (error == ENOSYS) { error = __sys_gettimeofday(tv, tz); + } else if (error != 0) { + errno = error; + error = -1; + } return (error); }