[Qemu-devel] [PATCH] Add uselib syscall

[Qemu-devel] [PATCH] Add uselib syscall

[Riku Voipio]

Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
---
 linux-user/syscall.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 6b38d8a..8b8262a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -282,6 +282,7 @@ extern int flock(int, int);
 extern int setfsuid(int);
 extern int setfsgid(int);
 extern int setgroups(int, gid_t *);
+extern int uselib(const char*);
 
 #define ERRNO_TABLE_SIZE 1200
 
@@ -4313,7 +4314,15 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 #endif
 #ifdef TARGET_NR_uselib
     case TARGET_NR_uselib:
-        goto unimplemented;
+        {
+            if(!(p = lock_user_string(arg1))) {
+                ret = -TARGET_EFAULT;
+                goto efault;
+            }
+            ret = get_errno(uselib(path(p)));
+            unlock_user(p, arg1, 0);
+        }
+        break;
 #endif
 #ifdef TARGET_NR_swapon
     case TARGET_NR_swapon:
-- 
1.5.6.5


-- 
"rm -rf" only sounds scary if you don't have backups

Re: [Qemu-devel] [PATCH] Add uselib syscall

[Kirill A. Shutemov]

[-- Attachment #1: Type: text/plain, Size: 1394 bytes --]

On Fri, Sep 19, 2008 at 04:33:27PM +0300, Riku Voipio wrote:
> 
> Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
> ---
>  linux-user/syscall.c |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 6b38d8a..8b8262a 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -282,6 +282,7 @@ extern int flock(int, int);
>  extern int setfsuid(int);
>  extern int setfsgid(int);
>  extern int setgroups(int, gid_t *);
> +extern int uselib(const char*);
>  
>  #define ERRNO_TABLE_SIZE 1200
>  
> @@ -4313,7 +4314,15 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
>  #endif
>  #ifdef TARGET_NR_uselib
>      case TARGET_NR_uselib:
> -        goto unimplemented;
> +        {
> +            if(!(p = lock_user_string(arg1))) {
> +                ret = -TARGET_EFAULT;
> +                goto efault;
> +            }
> +            ret = get_errno(uselib(path(p)));
> +            unlock_user(p, arg1, 0);
> +        }
> +        break;
>  #endif
>  #ifdef TARGET_NR_swapon
>      case TARGET_NR_swapon:

Looks good for me. Added to my patchset.

> -- 
> 1.5.6.5
> 
> 
> -- 
> "rm -rf" only sounds scary if you don't have backups
> 
> 

-- 
Regards,  Kirill A. Shutemov
 + Belarus, Minsk
 + ALT Linux Team, http://www.altlinux.com/

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: [Qemu-devel] [PATCH] Add uselib syscall

[Paul Brook]

>      case TARGET_NR_uselib:
> -        goto unimplemented;
> +        {
> +            if(!(p = lock_user_string(arg1))) {
> +                ret = -TARGET_EFAULT;
> +                goto efault;
> +            }
> +            ret = get_errno(uselib(path(p)));
> +            unlock_user(p, arg1, 0);
> +        }
> +        break;

I'm pretty sure this is wrong. The last thing we want to be doing is loading a 
host library.

Paul