From nobody Fri Nov 7 12:59:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547848149025954.2650453103254; Fri, 18 Jan 2019 13:49:09 -0800 (PST) Received: from localhost ([127.0.0.1]:47617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkc0e-0001o0-F3 for importer@patchew.org; Fri, 18 Jan 2019 16:49:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkbkz-0005at-6v for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:32:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkbkx-0005B6-04 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:32:53 -0500 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:42955) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkbkt-00054z-CU for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:32:49 -0500 Received: by mail-pl1-x644.google.com with SMTP id y1so6880894plp.9 for ; Fri, 18 Jan 2019 13:32:43 -0800 (PST) Received: from cloudburst.twiddle.net ([2001:8000:10e0:a000:c673:a6b6:fdef:1933]) by smtp.gmail.com with ESMTPSA id v12sm5833667pgg.41.2019.01.18.13.32.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Jan 2019 13:32:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=81GJt5WLaa4PEnMi0/KdLKOBBXY88vrv1HEVQU6kpFA=; b=PllCFBqtBnpNqkUcEfHNehFVxrVwYVsfJ6N6g6qp4S79+3vc0J0xdlZlkCF5eS2myY iMyWHtqZLaAMeTNDw5H9ZgL0ntncSHiSngP/frMi7Wm995tbHsPgL4er3YgZR4upI+sz q4knxBk4Lyw7Z/TrxxUzTFOg7Q0HGP7vBojQI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=81GJt5WLaa4PEnMi0/KdLKOBBXY88vrv1HEVQU6kpFA=; b=B5l7c8UcVCEz6mv9LQFHMu78W/tdNn9xIu7+ZbrWk5W2Pvj1YmFCc1aSRUGmN9dauh t8bZ03c4txo6l1YmLhkWZIci+aXst95wvqcUQevWRFrtRbsB3V9XuKEY4KN/KI45S8f5 XaaACb7BggPgrjHZMUNsXbfFn5aOK4YOP0GZV2YaBkGVO3XPQY37dvzeaVDXLW/y8ata vR+ZS6XFILGYOIbSPT1EQV5wVsSeRlFJ4+gb/HjeUxYLl03IHge8GlJUO3fkKJM/ReFi eYsDpVxAIUql2HQRq2Wbzm23qEt5N9xX2tqmjYwdYy04wP40DfxRHmOehduPzI3SGc2V 0zIA== X-Gm-Message-State: AJcUukctOy9W/8dZG2v1sy5tEsgJ+0GOmSYy+sfaGUEAOSq5ckIG64xv fXUHDSMdoAstzOXQGeiX84pEzVnM0O4= X-Google-Smtp-Source: ALg8bN758VhEIcMzyiZf4qVWCBMyEvttcrNBt89RKOs/b1sqBpinTNhFS0Gajmmnh7LvSWssXQD1aw== X-Received: by 2002:a17:902:7882:: with SMTP id q2mr21281784pll.305.1547847162025; Fri, 18 Jan 2019 13:32:42 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 19 Jan 2019 08:31:05 +1100 Message-Id: <20190118213122.22865-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190118213122.22865-1-richard.henderson@linaro.org> References: <20190118213122.22865-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::644 Subject: [Qemu-devel] [PATCH v6 32/49] linux-user: Split out mount X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- linux-user/syscall-defs.h | 1 + linux-user/syscall.h | 1 + linux-user/strace.c | 21 +++---------- linux-user/syscall-file.inc.c | 48 ++++++++++++++++++++++++++++++ linux-user/syscall.c | 55 ----------------------------------- linux-user/strace.list | 3 -- 6 files changed, 54 insertions(+), 75 deletions(-) diff --git a/linux-user/syscall-defs.h b/linux-user/syscall-defs.h index d163bbf409..2b331c6a6d 100644 --- a/linux-user/syscall-defs.h +++ b/linux-user/syscall-defs.h @@ -78,6 +78,7 @@ SYSCALL_DEF_FULL(mmap2, .impl =3D impl_mmap, .arg_type =3D { ARG_PTR, ARG_DEC, ARG_MMAPPROT, ARG_MMAPFLAG, ARG_DEC, ARG_DEC64 }); #endif +SYSCALL_DEF(mount, ARG_STR, ARG_STR, ARG_STR, ARG_MOUNTFLAG, ARG_PTR); SYSCALL_DEF(mprotect, ARG_PTR, ARG_DEC, ARG_MMAPPROT); SYSCALL_DEF_FULL(mremap, .impl =3D impl_mremap, .print_ret =3D print_syscall_ptr_ret, diff --git a/linux-user/syscall.h b/linux-user/syscall.h index c16c0a3f1e..35dd3e5fa3 100644 --- a/linux-user/syscall.h +++ b/linux-user/syscall.h @@ -62,6 +62,7 @@ typedef enum { ARG_MMAPFLAG, ARG_MMAPPROT, ARG_MODEFLAG, + ARG_MOUNTFLAG, ARG_OPENFLAG, ARG_UNLINKATFLAG, ARG_LSEEKWHENCE, diff --git a/linux-user/strace.c b/linux-user/strace.c index c08dbdff0c..eb02430eba 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -708,7 +708,7 @@ static struct flags const open_flags[] =3D { FLAG_END, }; =20 -UNUSED static struct flags mount_flags[] =3D { +static struct flags const mount_flags[] =3D { #ifdef MS_BIND FLAG_GENERIC(MS_BIND), #endif @@ -2003,22 +2003,6 @@ print_symlinkat(const struct syscallname *name, } #endif =20 -#ifdef TARGET_NR_mount -static void -print_mount(const struct syscallname *name, - abi_long arg0, abi_long arg1, abi_long arg2, - abi_long arg3, abi_long arg4, abi_long arg5) -{ - print_syscall_prologue(name); - print_string(arg0, 0); - print_string(arg1, 0); - print_string(arg2, 0); - print_flags(mount_flags, arg3, 0); - print_pointer(arg4, 1); - print_syscall_epilogue(name); -} -#endif - #ifdef TARGET_NR_umount static void print_umount(const struct syscallname *name, @@ -2303,6 +2287,9 @@ static void print_syscall_def1(const SyscallDef *def,= int64_t args[6]) case ARG_MODEFLAG: len =3D add_flags(b, rest, mode_flags, arg, true); break; + case ARG_MOUNTFLAG: + len =3D add_flags(b, rest, mount_flags, arg, true); + break; case ARG_OPENFLAG: len =3D add_open_flags(b, rest, arg); break; diff --git a/linux-user/syscall-file.inc.c b/linux-user/syscall-file.inc.c index e23d21bdfc..d7eb72cc31 100644 --- a/linux-user/syscall-file.inc.c +++ b/linux-user/syscall-file.inc.c @@ -174,6 +174,54 @@ SYSCALL_IMPL(mknodat) return do_mknodat(arg1, arg2, arg3, arg4); } =20 +SYSCALL_IMPL(mount) +{ + abi_ulong target_src =3D arg1; + abi_ulong target_tgt =3D arg2; + abi_ulong target_fst =3D arg3; + abi_ulong mountflags =3D arg4; + abi_ulong target_data =3D arg5; + char *p_src =3D NULL, *p_tgt =3D NULL, *p_fst =3D NULL, *p_data =3D NU= LL; + abi_long ret =3D -TARGET_EFAULT; + + if (target_src) { + p_src =3D lock_user_string(target_src); + if (!p_src) { + goto exit0; + } + } + + p_tgt =3D lock_user_string(target_tgt); + if (!p_tgt) { + goto exit1; + } + + if (target_fst) { + p_fst =3D lock_user_string(target_fst); + if (!p_fst) { + goto exit2; + } + } + + /* + * FIXME - arg5 should be locked, but it isn't clear how to + * do that since it's not guaranteed to be a NULL-terminated + * string. + */ + if (target_data) { + p_data =3D g2h(target_data); + } + ret =3D get_errno(mount(p_src, p_tgt, p_fst, mountflags, p_data)); + + unlock_user(p_fst, target_fst, 0); + exit2: + unlock_user(p_tgt, target_tgt, 0); + exit1: + unlock_user(p_src, target_src, 0); + exit0: + return ret; +} + /* * Helpers for do_openat, manipulating /proc/self/foo. */ diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 6ea1a67345..39e749a985 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5327,61 +5327,6 @@ static abi_long do_syscall1(void *cpu_env, int num, = abi_long arg1, void *p; =20 switch(num) { - case TARGET_NR_mount: - { - /* need to look at the data field */ - void *p2, *p3; - - if (arg1) { - p =3D lock_user_string(arg1); - if (!p) { - return -TARGET_EFAULT; - } - } else { - p =3D NULL; - } - - p2 =3D lock_user_string(arg2); - if (!p2) { - if (arg1) { - unlock_user(p, arg1, 0); - } - return -TARGET_EFAULT; - } - - if (arg3) { - p3 =3D lock_user_string(arg3); - if (!p3) { - if (arg1) { - unlock_user(p, arg1, 0); - } - unlock_user(p2, arg2, 0); - return -TARGET_EFAULT; - } - } else { - p3 =3D NULL; - } - - /* FIXME - arg5 should be locked, but it isn't clear how to - * do that since it's not guaranteed to be a NULL-terminated - * string. - */ - if (!arg5) { - ret =3D mount(p, p2, p3, (unsigned long)arg4, NULL); - } else { - ret =3D mount(p, p2, p3, (unsigned long)arg4, g2h(arg5)); - } - ret =3D get_errno(ret); - - if (arg1) { - unlock_user(p, arg1, 0); - } - unlock_user(p2, arg2, 0); - if (arg3) { - unlock_user(p3, arg3, 0); - } - } - return ret; #ifdef TARGET_NR_umount case TARGET_NR_umount: if (!(p =3D lock_user_string(arg1))) diff --git a/linux-user/strace.list b/linux-user/strace.list index 344a2232d6..5f07e0e23d 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -497,9 +497,6 @@ #ifdef TARGET_NR_modify_ldt { TARGET_NR_modify_ldt, "modify_ldt" , NULL, NULL, NULL }, #endif -#ifdef TARGET_NR_mount -{ TARGET_NR_mount, "mount" , NULL, print_mount, NULL }, -#endif #ifdef TARGET_NR_move_pages { TARGET_NR_move_pages, "move_pages" , NULL, NULL, NULL }, #endif --=20 2.17.2