Skip to content

Commit

Permalink
linux-user: Fix fcntl() and fcntl64() to return O_LARGEFILE for 32-bi…
Browse files Browse the repository at this point in the history
…t targets

When running a 32-bit guest on a 64-bit host, fcntl[64](F_GETFL) should
return with the TARGET_O_LARGEFILE flag set, because all 64-bit hosts
support large files unconditionally.

But on 64-bit hosts, O_LARGEFILE has the value 0, so the flag
translation can't be done with the fcntl_flags_tbl[]. Instead add the
TARGET_O_LARGEFILE flag afterwards.

Note that for 64-bit guests the compiler will optimize away this code,
since TARGET_O_LARGEFILE is zero.

Signed-off-by: Helge Deller <deller@gmx.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
(cherry picked from commit e0ddf8e)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
hdeller authored and Michael Tokarev committed Jul 31, 2023
1 parent 73d6ac2 commit 741df48
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions linux-user/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -7132,6 +7132,10 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
ret = get_errno(safe_fcntl(fd, host_cmd, arg));
if (ret >= 0) {
ret = host_to_target_bitmask(ret, fcntl_flags_tbl);
/* tell 32-bit guests it uses largefile on 64-bit hosts: */
if (O_LARGEFILE == 0 && HOST_LONG_BITS == 64) {
ret |= TARGET_O_LARGEFILE;
}
}
break;

Expand Down

0 comments on commit 741df48

Please sign in to comment.