All of lore.kernel.org
 help / color / mirror / Atom feed
From: riku.voipio@linaro.org
To: qemu-devel@nongnu.org
Cc: James Cowgill <james.cowgill@mips.com>
Subject: [Qemu-devel] [PULL 10/15] linux-user: return EINVAL from prctl(PR_*_SECCOMP)
Date: Mon, 20 Nov 2017 23:21:38 +0200	[thread overview]
Message-ID: <a8b154a637b586441bad42259a8a9b9619cd117c.1511212753.git.riku.voipio@linaro.org> (raw)
In-Reply-To: <cover.1511212753.git.riku.voipio@linaro.org>

From: James Cowgill <james.cowgill@mips.com>

If an application tries to install a seccomp filter using
prctl(PR_SET_SECCOMP), the filter is likely for the target instead of the host
architecture. This will probably cause qemu to be immediately killed when it
executes another syscall.

Prevent this from happening by returning EINVAL from both seccomp prctl
calls. This is the error returned by the kernel when seccomp support is
disabled.

Fixes: https://bugs.launchpad.net/qemu/+bug/1726394
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: James Cowgill <james.cowgill@mips.com>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/syscall.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 84e123b67b..f31b853bb7 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -10505,6 +10505,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
             break;
         }
 #endif
+        case PR_GET_SECCOMP:
+        case PR_SET_SECCOMP:
+            /* Disable seccomp to prevent the target disabling syscalls we
+             * need. */
+            ret = -TARGET_EINVAL;
+            break;
         default:
             /* Most prctl options have no pointer arguments */
             ret = get_errno(prctl(arg1, arg2, arg3, arg4, arg5));
-- 
2.14.2

  parent reply	other threads:[~2017-11-20 21:22 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-20 21:21 [Qemu-devel] [PULL 00/15] late linux-user fixes for 2.11 riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 01/15] linux-user: Restrict usage of sa_restorer riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 02/15] linux-user/hppa: Fix TARGET_SA_* defines riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 03/15] linux-user/hppa: Fix cpu_clone_regs riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 04/15] linux-user/hppa: Fix typo for TARGET_NR_epoll_wait riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 05/15] linux-user/hppa: Fix TARGET_MAP_TYPE riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 06/15] linux-user/hppa: Fix TARGET_F_RDLCK, TARGET_F_WRLCK, TARGET_F_UNLCK riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 07/15] linux-user: Handle TARGET_MAP_STACK and TARGET_MAP_HUGETLB riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 08/15] linux-user/syscall.c: Handle SH4's exceptional alignment for p{read, write}64 riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 09/15] linux-user: fix 'finshed' typo in comment riku.voipio
2017-11-20 21:21 ` riku.voipio [this message]
2017-11-20 21:21 ` [Qemu-devel] [PULL 11/15] linux-user/s390x: Mask si_addr for SIGSEGV riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 12/15] linux-user/ppc: Report correct fault address for data faults riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 13/15] linux-user/sparc: Put address for data faults where linux-user expects it riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 14/15] linux-user: Handle rt_sigaction correctly for SPARC riku.voipio
2017-11-20 21:21 ` [Qemu-devel] [PULL 15/15] linux-user: Fix calculation of auxv length riku.voipio
2017-11-20 21:36 ` [Qemu-devel] [PULL 00/15] late linux-user fixes for 2.11 no-reply
2017-11-20 21:36 ` no-reply
2017-11-21 11:19 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a8b154a637b586441bad42259a8a9b9619cd117c.1511212753.git.riku.voipio@linaro.org \
    --to=riku.voipio@linaro.org \
    --cc=james.cowgill@mips.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.