diff mbox

linux-user: add getrandom() syscall

Message ID 1454702453-13943-1-git-send-email-laurent@vivier.eu
State New
Headers show

Commit Message

Laurent Vivier Feb. 5, 2016, 8 p.m. UTC
getrandom() has been introduced in kernel 3.17 and is now used during
the boot sequence of Debian unstable (stretch/sid).

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/syscall.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

Comments

Riku Voipio Feb. 15, 2016, 1:16 p.m. UTC | #1
On perjantaina 5. helmikuuta 2016 22.00.53 EET, Laurent Vivier wrote:
> getrandom() has been introduced in kernel 3.17 and is now used during
> the boot sequence of Debian unstable (stretch/sid).

Applied, thanks

> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  linux-user/syscall.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index dac5518..6801fa2 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -249,6 +249,9 @@ _syscall2(int, ioprio_get, int, which, int, who)
>  #if defined(TARGET_NR_ioprio_set) && defined(__NR_ioprio_set)
>  _syscall3(int, ioprio_set, int, which, int, who, int, ioprio)
>  #endif
> +#ifdef TARGET_NR_getrandom
> +_syscall3(int, getrandom, void *, buf, size_t, buflen, unsigned int, flags)
> +#endif
>  
>  static bitmask_transtbl fcntl_flags_tbl[] = {
>    { TARGET_O_ACCMODE,   TARGET_O_WRONLY,    O_ACCMODE,   O_WRONLY,    },
> @@ -7541,6 +7544,16 @@ abi_long do_syscall(void *cpu_env, int 
> num, abi_long arg1,
>          ret = get_errno(shutdown(arg1, arg2));
>          break;
>  #endif
> +#ifdef TARGET_NR_getrandom
> +    case TARGET_NR_getrandom:
> +        p = lock_user(VERIFY_WRITE, arg1, arg2, 0);
> +        if (!p) {
> +            goto efault;
> +        }
> +        ret = get_errno(getrandom(p, arg2, arg3));
> +        unlock_user(p, arg1, ret);
> +        break;
> +#endif
>  #ifdef TARGET_NR_socket
>      case TARGET_NR_socket:
>          ret = do_socket(arg1, arg2, arg3);
diff mbox

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index dac5518..6801fa2 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -249,6 +249,9 @@  _syscall2(int, ioprio_get, int, which, int, who)
 #if defined(TARGET_NR_ioprio_set) && defined(__NR_ioprio_set)
 _syscall3(int, ioprio_set, int, which, int, who, int, ioprio)
 #endif
+#ifdef TARGET_NR_getrandom
+_syscall3(int, getrandom, void *, buf, size_t, buflen, unsigned int, flags)
+#endif
 
 static bitmask_transtbl fcntl_flags_tbl[] = {
   { TARGET_O_ACCMODE,   TARGET_O_WRONLY,    O_ACCMODE,   O_WRONLY,    },
@@ -7541,6 +7544,16 @@  abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
         ret = get_errno(shutdown(arg1, arg2));
         break;
 #endif
+#ifdef TARGET_NR_getrandom
+    case TARGET_NR_getrandom:
+        p = lock_user(VERIFY_WRITE, arg1, arg2, 0);
+        if (!p) {
+            goto efault;
+        }
+        ret = get_errno(getrandom(p, arg2, arg3));
+        unlock_user(p, arg1, ret);
+        break;
+#endif
 #ifdef TARGET_NR_socket
     case TARGET_NR_socket:
         ret = do_socket(arg1, arg2, arg3);