Skip to content

Commit

Permalink
bsd-user: Implement shm_open2(2) system call
Browse files Browse the repository at this point in the history
Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230925182709.4834-6-kariem.taha2.7@gmail.com>
  • Loading branch information
Karim Taha authored and bsdimp committed Oct 3, 2023
1 parent 137d963 commit 0c35298
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 6 deletions.
46 changes: 46 additions & 0 deletions bsd-user/freebsd/os-misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,51 @@
#include <sys/random.h>
#include <sched.h>

/*
* shm_open2 isn't exported, but the __sys_ alias is. We can use either for the
* static version, but to dynamically link we have to use the sys version.
*/
int __sys_shm_open2(const char *path, int flags, mode_t mode, int shmflags,
const char *);

#if defined(__FreeBSD_version) && __FreeBSD_version >= 1300048
/* shm_open2(2) */
static inline abi_long do_freebsd_shm_open2(abi_ulong pathptr, abi_ulong flags,
abi_long mode, abi_ulong shmflags, abi_ulong nameptr)
{
int ret;
void *uname, *upath;

if (pathptr == (uintptr_t)SHM_ANON) {
upath = SHM_ANON;
} else {
upath = lock_user_string(pathptr);
if (upath == NULL) {
return -TARGET_EFAULT;
}
}

uname = NULL;
if (nameptr != 0) {
uname = lock_user_string(nameptr);
if (uname == NULL) {
unlock_user(upath, pathptr, 0);
return -TARGET_EFAULT;
}
}
ret = get_errno(__sys_shm_open2(upath,
target_to_host_bitmask(flags, fcntl_flags_tbl), mode,
target_to_host_bitmask(shmflags, shmflag_flags_tbl), uname));

if (upath != SHM_ANON) {
unlock_user(upath, pathptr, 0);
}
if (uname != NULL) {
unlock_user(uname, nameptr, 0);
}
return ret;
}
#endif /* __FreeBSD_version >= 1300048 */


#endif /* OS_MISC_H */
22 changes: 16 additions & 6 deletions bsd-user/freebsd/os-syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,14 @@
#include "signal-common.h"
#include "user/syscall-trace.h"

/* BSD independent syscall shims */
#include "bsd-file.h"
#include "bsd-proc.h"

/* BSD dependent syscall shims */
#include "os-stat.h"
#include "os-proc.h"

/* used in os-proc */
safe_syscall4(pid_t, wait4, pid_t, wpid, int *, status, int, options,
struct rusage *, rusage);
safe_syscall6(pid_t, wait6, idtype_t, idtype, id_t, id, int *, status, int,
options, struct __wrusage *, wrusage, siginfo_t *, infop);
#include "os-misc.h"

/* I/O */
safe_syscall3(int, open, const char *, path, int, flags, mode_t, mode);
Expand All @@ -65,6 +61,12 @@ safe_syscall3(ssize_t, writev, int, fd, const struct iovec *, iov, int, iovcnt);
safe_syscall4(ssize_t, pwritev, int, fd, const struct iovec *, iov, int, iovcnt,
off_t, offset);

/* used in os-proc */
safe_syscall4(pid_t, wait4, pid_t, wpid, int *, status, int, options,
struct rusage *, rusage);
safe_syscall6(pid_t, wait6, idtype_t, idtype, id_t, id, int *, status, int,
options, struct __wrusage *, wrusage, siginfo_t *, infop);

void target_set_brk(abi_ulong new_brk)
{
}
Expand Down Expand Up @@ -796,6 +798,14 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
ret = do_freebsd_fcntl(arg1, arg2, arg3);
break;

/*
* Memory management system calls.
*/
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1300048
case TARGET_FREEBSD_NR_shm_open2: /* shm_open2(2) */
ret = do_freebsd_shm_open2(arg1, arg2, arg3, arg4, arg5);
break;
#endif

/*
* sys{ctl, arch, call}
Expand Down

0 comments on commit 0c35298

Please sign in to comment.