From patchwork Mon Apr 20 21:22:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 185584 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp4454521ilf; Mon, 20 Apr 2020 14:25:26 -0700 (PDT) X-Google-Smtp-Source: APiQypKoTGl8SHEd3rFqjKe7nTe+BTGhmjRWYh50Gv2ZTn7vUzQx1qHDoZsOwi7x7vAY2A2MdHqV X-Received: by 2002:ac8:7309:: with SMTP id x9mr18598692qto.68.1587417926571; Mon, 20 Apr 2020 14:25:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587417926; cv=none; d=google.com; s=arc-20160816; b=wXQvWDiI+vWUQ0pqcmBLWYAHZx3K922i++NVUVaU+PcyBg9bO22InxOo9ZsSxUfbWM J8J3e9mwRzXlJMygshcrF1n3rHZodJVk/zuVa4C9WxgNfmeMhrQT3WMqVS3H1eYDuZBs d4ukLRIOVVElW92QX+YFIpz1xqkcSpNdNUz/3KlCP1wuvzsOIOrs/NyURQwZq/22dCgx GxpfUe4/NdyTOBAcxRbD2JwsfR6Jo0fbmAZUiWkNm1P3lrXxBVFJxlREbOzA40Fmux7M j1wB8s176I4RdC/RHv53gALrt1WRZ4czfqyi89qXWQmESByF6zH5gA0anbtVPxA45L5X XznQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=yNdZAQTtVSGKFWzXSVWtiZmV8YVbig1mvz+Yew2q/QA=; b=XZ+ssEb+yjVLAdMTvfDJAtBUa+fuF40T4jBUoa496rrA11ySpxYcdHIa7SjuNLHsmj V9Q4gXXHAsXp4BwfwlBa8nqya2J+j4+5npCdxTcew4UM4WSmCv2cqKma/4RGEMwZn2Lc opfrBBy1Mso2opzKGsEF0LKGi8PGcAvKZ7DUJHfzXe0v6m4jU8pMjdh4lzFJWjNAhKy2 iGJMfFkzIhLroRXqpU2G1auZlgogwhNFzTdAYBV5Jf7nCwmh7k5Tk4LCnuyPdBqEdBCA 202iFWQmGvGiwJivPRj3toda6mT3FY7F2+NVgXsWpGiFKk3/1+RjOFK9LVsboqer+TM5 6FSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pJBIHjOP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j34si259764qta.373.2020.04.20.14.25.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Apr 2020 14:25:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pJBIHjOP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQduw-0001v0-2T for patch@linaro.org; Mon, 20 Apr 2020 17:25:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42152) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQdrs-0006pk-Ja for qemu-devel@nongnu.org; Mon, 20 Apr 2020 17:22:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQdrq-0006uo-R3 for qemu-devel@nongnu.org; Mon, 20 Apr 2020 17:22:15 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:40381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQdrq-0006qg-9R for qemu-devel@nongnu.org; Mon, 20 Apr 2020 17:22:14 -0400 Received: by mail-wm1-x342.google.com with SMTP id u16so1230081wmc.5 for ; Mon, 20 Apr 2020 14:22:13 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=yNdZAQTtVSGKFWzXSVWtiZmV8YVbig1mvz+Yew2q/QA=; b=pJBIHjOPTCCxVZgGAqqUME2UvWSREYhZe0N+VyuBRBuJ3hAx1gVgSShcObaBxmKpcN Pn/2oZC+pvZeWktQ60y0GDZWrTvT6zbZ6u9CujrLX3mieCwzVwbW9HICx2xU+0YQZnI+ tdfUseBXjk1DvkslHbNIge9LMbxRszIA3AMa2y4dFzhTLuIdx1YxbrkBa1/Ycbbeg6Q+ 7uJ/yFMPTALjY33rMdeucWBSzhY5oxV6tGlWPTskNXx+Rdn04E58XR9XKWXEhP2h3yKL zGirdf3JpUyV0qcDhXFZ868RVjGN/TZHyJWv0Nz7iMgFyVw2ZaN6Hdw0mICKsBZ/NZfs zxRg== 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:mime-version:content-transfer-encoding; bh=yNdZAQTtVSGKFWzXSVWtiZmV8YVbig1mvz+Yew2q/QA=; b=QLiTR4TF470y9I1beYHAZUKULA21Tm9EJNn2ZST9RUoaGJgIzfedhH27wBblIVOAfT YU2REN99Mk73oU/MqpGMd4vRKxBeuj2Xqo6SHtoC62zOHMmDiBWR2If0e0Mzc5sSuq+u lnmRMba3WHF78fLWWgY+H8gW+UXQ+YJ7pg7XNoKDMuY4eQHyVTMCUrpxRRXVm4IJ+/oL 00zjIHmrvNceTKvDSEGeO7KT60NdnXB/pUQr+4sPScTMO4Db3RcVZpG5U3XbFjD36ysq e8/a+I1poF54ATBSBC8Km6cGnWlcHVa6eAnToQ5TcJkoiMlANIoMG/FQMqMhI2E/ChUm ZtxQ== X-Gm-Message-State: AGi0PubWyu3omJ5IEls4Y1j6ZyH0j707sTBnmlcXlf9InMN4LwjoCJTZ Grs9L+SJ5W18UwSuPURfkkL8PQ== X-Received: by 2002:a05:600c:c9:: with SMTP id u9mr1343790wmm.15.1587417732839; Mon, 20 Apr 2020 14:22:12 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j10sm823663wmi.18.2020.04.20.14.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 14:22:12 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 3/4] linux-user/arm: Handle invalid arm-specific syscalls correctly Date: Mon, 20 Apr 2020 22:22:05 +0100 Message-Id: <20200420212206.12776-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200420212206.12776-1-peter.maydell@linaro.org> References: <20200420212206.12776-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: omerg681@gmail.com, Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The kernel has different handling for syscalls with invalid numbers that are in the "arm-specific" range 0x9f0000 and up: * 0x9f0000..0x9f07ff return -ENOSYS if not implemented * other out of range syscalls cause a SIGILL (see the kernel's arch/arm/kernel/traps.c:arm_syscall()) Implement this distinction. (Note that our code doesn't look quite like the kernel's, because we have removed the 0x900000 prefix by this point, whereas the kernel retains it in arm_syscall().) Signed-off-by: Peter Maydell --- linux-user/arm/cpu_loop.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c index 025887d6b86..f042108b0be 100644 --- a/linux-user/arm/cpu_loop.c +++ b/linux-user/arm/cpu_loop.c @@ -332,10 +332,32 @@ void cpu_loop(CPUARMState *env) env->regs[0] = cpu_get_tls(env); break; default: - qemu_log_mask(LOG_UNIMP, - "qemu: Unsupported ARM syscall: 0x%x\n", - n); - env->regs[0] = -TARGET_ENOSYS; + if (n < 0xf0800) { + /* + * Syscalls 0xf0000..0xf07ff (or 0x9f0000.. + * 0x9f07ff in OABI numbering) are defined + * to return -ENOSYS rather than raising + * SIGILL. Note that we have already + * removed the 0x900000 prefix. + */ + qemu_log_mask(LOG_UNIMP, + "qemu: Unsupported ARM syscall: 0x%x\n", + n); + env->regs[0] = -TARGET_ENOSYS; + } else { + /* Otherwise SIGILL */ + info.si_signo = TARGET_SIGILL; + info.si_errno = 0; + info.si_code = TARGET_ILL_ILLTRP; + info._sifields._sigfault._addr = env->regs[15]; + if (env->thumb) { + info._sifields._sigfault._addr -= 2; + } else { + info._sifields._sigfault._addr -= 2; + } + queue_signal(env, info.si_signo, + QEMU_SI_FAULT, &info); + } break; } } else {