From patchwork Tue Oct 10 00:55:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 115328 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3177993qgn; Mon, 9 Oct 2017 18:12:48 -0700 (PDT) X-Received: by 10.237.57.98 with SMTP id l89mr6949050qte.77.1507597968295; Mon, 09 Oct 2017 18:12:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507597968; cv=none; d=google.com; s=arc-20160816; b=CpCouL0a5HCPZ5+Hz7OYvkICZdmAP8yvC7qPbMqL169g/N/DKWhCUE+LIj1i1SjEtS mYhly+aALJE21d9ZwkLKA3iFiv6SgvW9ox4mAc2kUVJ852lXq60ig7EJZbabtWyLxSjx eyBgqG4qg4jI0p+mSElJZ74APwRUn0PcHAGesG7XoErAvp5Ry5sHQl4sj74nEp9TNfJf q4fyVFCBfpZ1ajigbjpR5jJTR4V5IIWj/c4ah43uZw6FJIONCcsgpYgIAcc23xs4r8LK VrYOun22tmH5d2sbR4VoyKER3+buStDMdlAeVbLCv+4+ze8SeTwB9+SI/l3g+Bx/Y6P/ c7hA== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=7PhYXNVan+59GZGMy7Bu0CSTBdngjVIJFxpG4Ksw8+k=; b=GRXZ0K2JyGVS53me2vkIp/+7sZyca9GhaM13fF+zAi6IegQBBKLiwDV+l7vGiNY3xl WHUg0r3X64+8tHNRIfpOTA/MYZyNRuvFpxyGXZMdj2zkBt+gGhj/d8idQ3BuB2iAwg0q Ddavk1Y6McIpTQHzbwDJwkuGcFihiYB68knG9HIg+CEh9X/HJBBcsiPQNSLPza/BjApH sroMEEgv7Skb7n6aiTusJ/rfU0o7+4680TW+mfO4KGjdkPj+o42klf/jjyCdxQ8bPdo/ KyayyYwQdSDzGlNpJB/4NfM/Pf1MUzFRv9VIdAQrg39+ll6Uyk/4kypFZ+GuhO4vp45y mlaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PR3WJpfJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p63si3024734qkh.429.2017.10.09.18.12.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 09 Oct 2017 18:12:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PR3WJpfJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:60556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1j6E-0006F9-8x for patch@linaro.org; Mon, 09 Oct 2017 21:12:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1iqV-0002Tv-9g for qemu-devel@nongnu.org; Mon, 09 Oct 2017 20:56:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1iqU-0004aV-Ig for qemu-devel@nongnu.org; Mon, 09 Oct 2017 20:56:31 -0400 Received: from mail-pf0-x233.google.com ([2607:f8b0:400e:c00::233]:50843) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1iqU-0004a0-Cv for qemu-devel@nongnu.org; Mon, 09 Oct 2017 20:56:30 -0400 Received: by mail-pf0-x233.google.com with SMTP id m63so15478329pfk.7 for ; Mon, 09 Oct 2017 17:56:30 -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; bh=7PhYXNVan+59GZGMy7Bu0CSTBdngjVIJFxpG4Ksw8+k=; b=PR3WJpfJA6ByR0/f8FbCEpv00qhD9SlHOHJHFaK0aT/C6QgmaiYgCeIH+1ZDWcYOMn Nfnx8Sty1idEe5x1EnTqXenrxs0hEbJyDFob5Xa8nvyD10gindP7HxWUDg1T1QdsDq1B 90DkpDrPF7fWhlk7FeTqZXh1XadFemk9VmjA4= 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=7PhYXNVan+59GZGMy7Bu0CSTBdngjVIJFxpG4Ksw8+k=; b=DdhqkjsrZUDO5nQcxEXIeHVBYhUfwHuPK8dWFDu6c93OSe54WMuz2oDUC4e+9V6Yif jwYQiwecIWh8lGu/sh9+JebSl0vcOETxcaSbKQQNGKZuHZcHe6tH+RhQ/ZNe/7oMyDfK WWtqOoCPnsE13xqirLa7qJEESsCOQEfJoJwsNncCLMmasOWkjicpwznLdyDoSXS2Ae1r Ezn+GWgHa9FXZAJ3zexgfasU5y+lm7ZxoFnpk4vKYp7eMfbVE5DGV677L5DifcF8uTw0 0ppu8a8ZkEQXr7mdW4D47W+6KVZwykkZH9cxuKM1MG6VT9AmIawNl273EEyt5zDp98GI bdxA== X-Gm-Message-State: AMCzsaVtinElqx+3p+UM6qGHFhIePJ69DSQVCI7/LUGt3oEfZKbmsWnc LIg3kESo5x9W5kYaMDzgxFBy1Hsfpzo= X-Google-Smtp-Source: AOwi7QCoQfE5CTNdIXYIdcPSIhVtfwadeUHSfu9HCok37DrB+Z1LH33SIXmee6xPx6o8Vsi0VlHH5A== X-Received: by 10.101.66.197 with SMTP id l5mr2998151pgp.240.1507596989031; Mon, 09 Oct 2017 17:56:29 -0700 (PDT) Received: from bigtime.twiddle.net (97-126-104-76.tukw.qwest.net. [97.126.104.76]) by smtp.gmail.com with ESMTPSA id n19sm17121368pfj.52.2017.10.09.17.56.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 17:56:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 9 Oct 2017 17:55:57 -0700 Message-Id: <20171010005600.28735-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171010005600.28735-1-richard.henderson@linaro.org> References: <20171010005600.28735-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::233 Subject: [Qemu-devel] [PULL 20/23] osdep: introduce qemu_mprotect_rwx/none 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: peter.maydell@linaro.org, "Emilio G. Cota" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Reviewed-by: Richard Henderson Signed-off-by: Emilio G. Cota Signed-off-by: Richard Henderson --- include/qemu/osdep.h | 2 ++ util/osdep.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) -- 2.13.6 diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 826650c58a..281782d526 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -371,6 +371,8 @@ void sigaction_invoke(struct sigaction *action, #endif int qemu_madvise(void *addr, size_t len, int advice); +int qemu_mprotect_rwx(void *addr, size_t size); +int qemu_mprotect_none(void *addr, size_t size); int qemu_open(const char *name, int flags, ...); int qemu_close(int fd); diff --git a/util/osdep.c b/util/osdep.c index a479fedc4a..0cf6d9944c 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -73,6 +73,47 @@ int qemu_madvise(void *addr, size_t len, int advice) #endif } +static int qemu_mprotect__osdep(void *addr, size_t size, int prot) +{ + g_assert(!((uintptr_t)addr & ~qemu_real_host_page_mask)); + g_assert(!(size & ~qemu_real_host_page_mask)); + +#ifdef _WIN32 + DWORD old_protect; + + if (!VirtualProtect(addr, size, prot, &old_protect)) { + error_report("%s: VirtualProtect failed with error code %d", + __func__, GetLastError()); + return -1; + } + return 0; +#else + if (mprotect(addr, size, prot)) { + error_report("%s: mprotect failed: %s", __func__, strerror(errno)); + return -1; + } + return 0; +#endif +} + +int qemu_mprotect_rwx(void *addr, size_t size) +{ +#ifdef _WIN32 + return qemu_mprotect__osdep(addr, size, PAGE_EXECUTE_READWRITE); +#else + return qemu_mprotect__osdep(addr, size, PROT_READ | PROT_WRITE | PROT_EXEC); +#endif +} + +int qemu_mprotect_none(void *addr, size_t size) +{ +#ifdef _WIN32 + return qemu_mprotect__osdep(addr, size, PAGE_NOACCESS); +#else + return qemu_mprotect__osdep(addr, size, PROT_NONE); +#endif +} + #ifndef _WIN32 static int fcntl_op_setlk = -1;