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

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();