derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch, sim-se: Fix size_t size mismatch bug

Browse Source 
Same as with the off_t, some syscalls were using
incorrect size parametres in place of a guest-defined
size_t. This commit changes the signature of said
syscalls and adds the size_t typedef to the
arch-dependent Linux OSs.

Change-Id: Iece43814971a8e6275d25f6789e41528d241d1f4
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
This commit is contained in:
Tiberiu Bucur
2024-08-20 15:17:51 +01:00
parent f74260c552
commit 107e8f3d17
10 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/arch/arm/linux/se_workload.cc
View File

@@ -305,10 +305,10 @@ class SyscallTable32 : public SyscallDescTable<EmuLinux::SyscallABI32>
{ base + 177, "rt_sigtimedwait" },
{ base + 178, "rt_sigqueueinfo", ignoreFunc },
{ base + 179, "rt_sigsuspend" },
{ base + 180, "pread64" },
{ base + 181, "pwrite64" },
{ base + 180, "pread64", pread64Func<ArmLinux32> },
{ base + 181, "pwrite64", pwrite64Func<ArmLinux32> },
{ base + 182, "chown" },
{ base + 183, "getcwd", getcwdFunc },
{ base + 183, "getcwd", getcwdFunc<ArmLinux32> },
{ base + 184, "capget" },
{ base + 185, "capset" },
{ base + 186, "sigaltstack" },
@@ -518,7 +518,7 @@ class SyscallTable64 : public SyscallDescTable<EmuLinux::SyscallABI64>
{ base + 14, "removexattr" },
{ base + 15, "lremovexattr" },
{ base + 16, "fremovexattr" },
{ base + 17, "getcwd", getcwdFunc },
{ base + 17, "getcwd", getcwdFunc<ArmLinux64> },
{ base + 18, "lookup_dcookie" },
{ base + 19, "eventfd2" },
{ base + 20, "epoll_create1" },
@@ -572,8 +572,8 @@ class SyscallTable64 : public SyscallDescTable<EmuLinux::SyscallABI64>
{ base + 64, "write", writeFunc<ArmLinux64> },
{ base + 65, "readv" },
{ base + 66, "writev", writevFunc<ArmLinux64> },
{ base + 67, "pread64" },
{ base + 68, "pwrite64" },
{ base + 67, "pread64", pread64Func<ArmLinux64> },
{ base + 68, "pwrite64", pwrite64Func<ArmLinux64> },
{ base + 69, "preadv" },
{ base + 70, "pwritev" },
{ base + 71, "sendfile64" },

1
src/arch/mips/linux/linux.hh
View File

@@ -203,6 +203,7 @@ class MipsLinux : public Linux, public OpenFlagTable<MipsLinux>
uint32_t mem_unit; /* Memory unit size in bytes */
};
typedef uint32_t size_t;
typedef int32_t off_t;
};

2
src/arch/mips/linux/se_workload.cc
View File

@@ -372,7 +372,7 @@ SyscallDescTable<MipsISA::SEWorkload::SyscallABI> EmuLinux::syscallDescs = {
{ 4200, "pread64" },
{ 4201, "pwrite64" },
{ 4202, "chown" },
{ 4203, "getcwd", getcwdFunc },
{ 4203, "getcwd", getcwdFunc<MipsLinux> },
{ 4204, "capget" },
{ 4205, "capset" },
{ 4206, "sigalstack" },

4
src/arch/riscv/linux/se_workload.cc
View File

@@ -152,7 +152,7 @@ SyscallDescTable<SEWorkload::SyscallABI64> EmuLinux::syscallDescs64 = {
{ 14, "removexattr" },
{ 15, "lremovexattr" },
{ 16, "fremovexattr" },
{ 17, "getcwd", getcwdFunc },
{ 17, "getcwd", getcwdFunc<RiscvLinux64> },
{ 18, "lookup_dcookie" },
{ 19, "eventfd2" },
{ 20, "epoll_create1" },
@@ -491,7 +491,7 @@ SyscallDescTable<SEWorkload::SyscallABI32> EmuLinux::syscallDescs32 = {
{ 14, "removexattr" },
{ 15, "lremovexattr" },
{ 16, "fremovexattr" },
{ 17, "getcwd", getcwdFunc },
{ 17, "getcwd", getcwdFunc<RiscvLinux32> },
{ 18, "lookup_dcookie" },
{ 19, "eventfd2" },
{ 20, "epoll_create1" },

2
src/arch/sparc/linux/linux.hh
View File

@@ -254,6 +254,7 @@ class SparcLinux : public Linux, public OpenFlagTable<SparcLinux>
ctc->setReg(SparcISA::SyscallPseudoReturnReg, 1);
}
typedef uint64_t size_t;
typedef int64_t off_t;
};
@@ -301,6 +302,7 @@ class Sparc32Linux : public SparcLinux
uint32_t mem_unit; /* Memory unit size in bytes */
};
typedef uint32_t size_t;
typedef int32_t off_t;
/// Resource constants for getrlimit() (overide some generics).

2
src/arch/sparc/linux/syscalls.cc
View File

@@ -215,7 +215,7 @@ SyscallDescTable<SEWorkload::SyscallABI32> EmuLinux::syscall32Descs = {
{ 116, "gettimeofday", gettimeofdayFunc<Sparc32Linux> }, // 32 bit
{ 117, "getrusage" }, // 32 bit
{ 118, "getsockopt" },
{ 119, "getcwd", getcwdFunc },
{ 119, "getcwd", getcwdFunc<Sparc32Linux> },
{ 120, "readv" },
{ 121, "writev" },
{ 122, "settimeofday" }, // 32 bit

2
src/arch/x86/linux/syscall_tbl32.cc
View File

@@ -237,7 +237,7 @@ SyscallDescTable<EmuLinux::SyscallABI32> EmuLinux::syscallDescs32 = {
{ 180, "pread64", pread64Func<X86Linux64> },
{ 181, "pwrite64", pwrite64Func<X86Linux64> },
{ 182, "chown" },
{ 183, "getcwd", getcwdFunc },
{ 183, "getcwd", getcwdFunc<X86Linux32> },
{ 184, "capget" },
{ 185, "capset" },
{ 186, "sigaltstack" },

2
src/arch/x86/linux/syscall_tbl64.cc
View File

@@ -133,7 +133,7 @@ SyscallDescTable<EmuLinux::SyscallABI64> EmuLinux::syscallDescs64 = {
#else
{ 78, "getdents" },
#endif
{ 79, "getcwd", getcwdFunc },
{ 79, "getcwd", getcwdFunc<X86Linux64> },
{ 80, "chdir", chdirFunc },
{ 81, "fchdir" },
{ 82, "rename", renameFunc },

30
src/sim/syscall_emul.cc
View File

@@ -344,36 +344,6 @@ gethostnameFunc(SyscallDesc *desc, ThreadContext *tc,
return 0;
}
SyscallReturn
getcwdFunc(SyscallDesc *desc, ThreadContext *tc,
VPtr<> buf_ptr, unsigned long size)
{
int result = 0;
auto p = tc->getProcessPtr();
BufferArg buf(buf_ptr, size);
// Is current working directory defined?
std::string cwd = p->tgtCwd;
if (!cwd.empty()) {
if (cwd.length() >= size) {
// Buffer too small
return -ERANGE;
}
strncpy((char *)buf.bufferPtr(), cwd.c_str(), size);
result = cwd.length();
} else {
if (getcwd((char *)buf.bufferPtr(), size)) {
result = strlen((char *)buf.bufferPtr());
} else {
result = -1;
}
}
buf.copyOut(SETranslatingPortProxy(tc));
return (result == -1) ? -errno : result;
}
SyscallReturn
unlinkFunc(SyscallDesc *desc, ThreadContext *tc, VPtr<> pathname)
{

47
src/sim/syscall_emul.hh
View File

@@ -173,10 +173,6 @@ SyscallReturn shutdownFunc(SyscallDesc *desc, ThreadContext *tc,
SyscallReturn gethostnameFunc(SyscallDesc *desc, ThreadContext *tc,
VPtr<> buf_ptr, int name_len);
/// Target getcwd() handler.
SyscallReturn getcwdFunc(SyscallDesc *desc, ThreadContext *tc,
VPtr<> buf_ptr, unsigned long size);
/// Target unlink() handler.
SyscallReturn unlinkFunc(SyscallDesc *desc, ThreadContext *tc,
VPtr<> pathname);
@@ -972,6 +968,38 @@ openFunc(SyscallDesc *desc, ThreadContext *tc,
desc, tc, OS::TGT_AT_FDCWD, pathname, tgt_flags, mode);
}
/// Target getcwd() handler
template <class OS>
SyscallReturn
getcwdFunc(SyscallDesc *desc, ThreadContext *tc,
VPtr<> buf_ptr, typename OS::size_t size)
{
int result = 0;
auto p = tc->getProcessPtr();
BufferArg buf(buf_ptr, size);
// Is current working directory defined?
std::string cwd = p->tgtCwd;
if (!cwd.empty()) {
if (cwd.length() >= size) {
// Buffer too small
return -ERANGE;
}
strncpy((char *)buf.bufferPtr(), cwd.c_str(), size);
result = cwd.length();
} else {
if (getcwd((char *)buf.bufferPtr(), size)) {
result = strlen((char *)buf.bufferPtr());
} else {
result = -1;
}
}
buf.copyOut(SETranslatingPortProxy(tc));
return (result == -1) ? -errno : result;
}
/// Target lseek() handler
template <class OS>
SyscallReturn
@@ -1341,7 +1369,8 @@ fchmodFunc(SyscallDesc *desc, ThreadContext *tc, int tgt_fd, uint32_t mode)
template <class OS>
SyscallReturn
mremapFunc(SyscallDesc *desc, ThreadContext *tc,
VPtr<> start, uint64_t old_length, uint64_t new_length, uint64_t flags,
VPtr<> start, typename OS::size_t old_length,
typename OS::size_t new_length, int flags,
guest_abi::VarArgs<uint64_t> varargs)
{
auto p = tc->getProcessPtr();
@@ -2106,7 +2135,7 @@ mmapFunc(SyscallDesc *desc, ThreadContext *tc,
template <class OS>
SyscallReturn
pread64Func(SyscallDesc *desc, ThreadContext *tc,
int tgt_fd, VPtr<> bufPtr, int nbytes,
int tgt_fd, VPtr<> bufPtr, typename OS::size_t nbytes,
typename OS::off_t offset)
{
auto p = tc->getProcessPtr();
@@ -2128,7 +2157,7 @@ pread64Func(SyscallDesc *desc, ThreadContext *tc,
template <class OS>
SyscallReturn
pwrite64Func(SyscallDesc *desc, ThreadContext *tc,
int tgt_fd, VPtr<> bufPtr, int nbytes,
int tgt_fd, VPtr<> bufPtr, typename OS::size_t nbytes,
typename OS::off_t offset)
{
auto p = tc->getProcessPtr();
@@ -2762,7 +2791,7 @@ selectFunc(SyscallDesc *desc, ThreadContext *tc, int nfds,
template <class OS>
SyscallReturn
readFunc(SyscallDesc *desc, ThreadContext *tc,
int tgt_fd, VPtr<> buf_ptr, int nbytes)
int tgt_fd, VPtr<> buf_ptr, typename OS::size_t nbytes)
{
auto p = tc->getProcessPtr();
@@ -2790,7 +2819,7 @@ readFunc(SyscallDesc *desc, ThreadContext *tc,
template <class OS>
SyscallReturn
writeFunc(SyscallDesc *desc, ThreadContext *tc,
int tgt_fd, VPtr<> buf_ptr, int nbytes)
int tgt_fd, VPtr<> buf_ptr, typename OS::size_t nbytes)
{
auto p = tc->getProcessPtr();