diff options
| author | Richard Henderson | 2021-11-22 10:33:12 +0100 |
|---|---|---|
| committer | Richard Henderson | 2021-11-22 10:33:13 +0100 |
| commit | 49aaac3548bc5a4632a14de939d5312b28dc1ba2 (patch) | |
| tree | 1a46b641adcca65caf83fbf01dc073bb1dd80bf8 /linux-user/syscall_defs.h | |
| parent | Merge tag 'pull-riscv-to-apply-20211122' of github.com:alistair23/qemu into s... (diff) | |
| parent | linux-user: fix Coverity CID 1464101 (diff) | |
| download | qemu-49aaac3548bc5a4632a14de939d5312b28dc1ba2.tar.gz qemu-49aaac3548bc5a4632a14de939d5312b28dc1ba2.tar.xz qemu-49aaac3548bc5a4632a14de939d5312b28dc1ba2.zip | |
Merge tag 'linux-user-for-6.2-pull-request' of git://github.com/vivier/qemu into staging
linux-user pull request 20211122
Fixes for CID 1464101 and gilab #704
# gpg: Signature made Mon 22 Nov 2021 09:22:37 AM CET
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
* tag 'linux-user-for-6.2-pull-request' of git://github.com/vivier/qemu:
linux-user: fix Coverity CID 1464101
linux-user: Rewrite do_getdents, do_getdents64
linux-user: Fix member types of target_dirent64
linux-user: Always use flexible arrays for dirent d_name
linux-user: Split out do_getdents, do_getdents64
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'linux-user/syscall_defs.h')
| -rw-r--r-- | linux-user/syscall_defs.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index a5ce487dcc..41aaafbac1 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -437,11 +437,11 @@ struct target_dirent { }; struct target_dirent64 { - uint64_t d_ino; - int64_t d_off; - unsigned short d_reclen; + abi_ullong d_ino; + abi_llong d_off; + abi_ushort d_reclen; unsigned char d_type; - char d_name[256]; + char d_name[]; }; @@ -2714,7 +2714,7 @@ struct linux_dirent { long d_ino; unsigned long d_off; unsigned short d_reclen; - char d_name[256]; /* We must not include limits.h! */ + char d_name[]; }; struct linux_dirent64 { @@ -2722,7 +2722,7 @@ struct linux_dirent64 { int64_t d_off; unsigned short d_reclen; unsigned char d_type; - char d_name[256]; + char d_name[]; }; struct target_mq_attr { |