linux-um.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Berg <benjamin@sipsolutions.net>
To: linux-um@lists.infradead.org, "Willy Tarreau" <w@1wt.eu>,
	"Thomas Weißschuh" <linux@weissschuh.net>,
	linux-kselftest@vger.kernel.org,
	"Arnaldo Carvalho de Melo" <acme@redhat.com>
Cc: linux-kernel@vger.kernel.org, Tiwei Bie <tiwei.btw@antgroup.com>,
	Benjamin Berg <benjamin.berg@intel.com>
Subject: [PATCH 4/9] tools/nolibc/dirent: avoid errno in readdir_r
Date: Mon, 15 Sep 2025 09:11:10 +0200	[thread overview]
Message-ID: <20250915071115.1429196-5-benjamin@sipsolutions.net> (raw)
In-Reply-To: <20250915071115.1429196-1-benjamin@sipsolutions.net>

From: Benjamin Berg <benjamin.berg@intel.com>

Using errno is not possible when NOLIBC_IGNORE_ERRNO is set. Use
sys_lseek instead of lseek as that avoids using errno.

Fixes: 665fa8dea90d ("tools/nolibc: add support for directory access")
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
---
 tools/include/nolibc/dirent.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/include/nolibc/dirent.h b/tools/include/nolibc/dirent.h
index 758b95c48e7a..61a122a60327 100644
--- a/tools/include/nolibc/dirent.h
+++ b/tools/include/nolibc/dirent.h
@@ -86,9 +86,9 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
 	 * readdir() can only return one entry at a time.
 	 * Make sure the non-returned ones are not skipped.
 	 */
-	ret = lseek(fd, ldir->d_off, SEEK_SET);
-	if (ret == -1)
-		return errno;
+	ret = sys_lseek(fd, ldir->d_off, SEEK_SET);
+	if (ret < 0)
+		return -ret;
 
 	entry->d_ino = ldir->d_ino;
 	/* the destination should always be big enough */
-- 
2.51.0



  parent reply	other threads:[~2025-09-15  7:22 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-15  7:11 [PATCH 0/9] Start porting UML to nolibc Benjamin Berg
2025-09-15  7:11 ` [PATCH 1/9] tools compiler.h: fix __used definition Benjamin Berg
2025-09-15  8:39   ` Thomas Weißschuh
2025-09-15  7:11 ` [PATCH 2/9] um: use tools/include for user files Benjamin Berg
2025-09-15 10:40   ` kernel test robot
2025-09-15  7:11 ` [PATCH 3/9] tools/nolibc/stdio: remove perror if NOLIBC_IGNORE_ERRNO is set Benjamin Berg
2025-09-15  8:44   ` Thomas Weißschuh
2025-09-15  7:11 ` Benjamin Berg [this message]
2025-09-15  8:45   ` [PATCH 4/9] tools/nolibc/dirent: avoid errno in readdir_r Thomas Weißschuh
2025-09-15  7:11 ` [PATCH 5/9] tools/nolibc: use __fallthrough__ rather than fallthrough Benjamin Berg
2025-09-15  8:50   ` Thomas Weißschuh
2025-09-15  7:11 ` [PATCH 6/9] tools/nolibc: add option to disable startup code Benjamin Berg
2025-09-15  8:55   ` Thomas Weißschuh
2025-09-15  7:11 ` [PATCH 7/9] um: add infrastructure to build files using nolibc Benjamin Berg
2025-09-15  8:57   ` Thomas Weißschuh
2025-09-15  7:11 ` [PATCH 8/9] um: use nolibc for the --showconfig implementation Benjamin Berg
2025-09-15  7:11 ` [PATCH 9/9] um: switch ptrace FP register access to nolibc Benjamin Berg
2025-09-15  9:07   ` Thomas Weißschuh
2025-09-15 11:09     ` Berg, Benjamin
2025-09-15 11:22       ` Thomas Weißschuh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250915071115.1429196-5-benjamin@sipsolutions.net \
    --to=benjamin@sipsolutions.net \
    --cc=acme@redhat.com \
    --cc=benjamin.berg@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-um@lists.infradead.org \
    --cc=linux@weissschuh.net \
    --cc=tiwei.btw@antgroup.com \
    --cc=w@1wt.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).