From patchwork Mon Oct 16 17:26:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 115978 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3970010qgn; Mon, 16 Oct 2017 11:07:15 -0700 (PDT) X-Received: by 10.200.43.167 with SMTP id m36mr14433112qtm.174.1508177235345; Mon, 16 Oct 2017 11:07:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508177235; cv=none; d=google.com; s=arc-20160816; b=1Gsk6x+tFLDCzbvsJxwrvNYqdT2TgZQrMjXviwiU3etkgI/96Hhccbz2ZQ5t+SzGW3 r1U+9d2NPn6pZsBMBb2FokkLpaLoo84ea3GxhovmgeQ8tZJgAw0fSvwtyk4vC40QERof 1wqW9QfNmlOsTe8cStGQasJwu876YJtyy1WJLdEzEbG7qeHT885D9rcVsxFd+u8CkPsl hjnKI/URjGugaaZMhFXXau5HU9djREu5TpWZU/x3FmztPR0eG5WACYfFIwxXMKmaI+OF eegcT8UlN919tyCM/g8sl9A737I5NMXWRrhqh275DR9l1Fg0LcS6CnpsXdNCFT+KqQCz d14g== 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=i1HvMWTORlTi4mrRA3t7lTf3wipFQA4Aj9Z7zWl118Y=; b=AGMduOedmdU4TiqhzxySxf8CsyCbomxXRtk9qky/NT3hHv/jAAdq3qEzObp7MYqZCc NEv0JNIJq6dfaa9blsOupNgrmfQtNryPquAoB/oZvAAPpSQsNunWqL2hlnmEEHGX1nfd byLKbaBhDP5yxOkb6LieeVh/3eP3euQVIqVy5+b7sAw1tw88RIYqy4Cqf8jxZCp2++ei x5NFuaJi32NcAd1Ekxx84787yZ4toxuQYL9rzzB/Tp/fe3rCOLa70X+Af/Wyw4FEatYy u0aXuxNOSqJtFg3ha+3yajFceZ9Est2lXhkPkjgNjBEM4rUNdhNzOqTVA/l7Jbvhckmw ZP4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Jdj99N04; 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 31si6862072qth.225.2017.10.16.11.07.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 16 Oct 2017 11:07:15 -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=Jdj99N04; 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]:34486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e49nF-0003Gr-6b for patch@linaro.org; Mon, 16 Oct 2017 14:07:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e49Af-0002uF-Gy for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:27:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e49Ae-00047I-JR for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:27:21 -0400 Received: from mail-pf0-x22e.google.com ([2607:f8b0:400e:c00::22e]:44289) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e49Ae-00046N-Ef for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:27:20 -0400 Received: by mail-pf0-x22e.google.com with SMTP id x7so16318496pfa.1 for ; Mon, 16 Oct 2017 10:27:20 -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=i1HvMWTORlTi4mrRA3t7lTf3wipFQA4Aj9Z7zWl118Y=; b=Jdj99N04fRMSvtuW4Vyehc94g3n4LBmX+psq1ZUfjoxZTQOfax1ajadM1fIBN0Y/SG aAUATCIuknda/a0dnxESAemTtyQBa6PQhq+vWlJN4SsQC1s0vXJmUxx4JH519fV3zN63 e3BGASh+FF7X249EbHmVZjA9dvg6D1E4peJ/c= 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=i1HvMWTORlTi4mrRA3t7lTf3wipFQA4Aj9Z7zWl118Y=; b=YVqEk5buDOhKLylay36Xw5oCF+bqlbcclkeYbATWCXFR09VsjC21tPDX4TeO1/7kVI YgjZ99KYgUVIHTgY4gd3Uq1Wwt4XGQyuPZgEZ1kkOyiifFoK5tluC6FVdTZ+PnDdv436 nLCbPN3bVB8nklq5LrMTZcO5z4kJu+J/HiTzNdrY2JJfFGZuqsOziu75ZsCHJCcSGwp1 jMpYxRGGGQDxV+Ixy+vkL6tBddXwGUQiIm9Z8TamFLC1g7asxzQtUOpYrYPe25XskTvl Ae6+KCjJI08WBhC8ACiYE1MVDx9z8HlF/uC3dP/4Tbn08Xkjx4mgpMssaNIcADsg3ox6 NJwA== X-Gm-Message-State: AMCzsaWytVGXHS//NvimPjXk5sb/je/suVImW2C3saD2v9Zc8we17SxF rpHWCDVMvsiKkMNk6duzYtsuMlrWgoM= X-Google-Smtp-Source: AOwi7QDUqToJw+HNxSswfH/yYIA0Z7InXLaiyCZK6WPb2pSY5taSBbboiiBk7Gvi15TKSfdf7bcMjQ== X-Received: by 10.84.244.198 with SMTP id f6mr9808305plt.32.1508174839233; Mon, 16 Oct 2017 10:27:19 -0700 (PDT) Received: from cloudburst.twiddle.net (97-126-104-76.tukw.qwest.net. [97.126.104.76]) by smtp.gmail.com with ESMTPSA id i187sm5594249pfc.96.2017.10.16.10.27.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Oct 2017 10:27:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 16 Oct 2017 10:26:06 -0700 Message-Id: <20171016172609.23422-48-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171016172609.23422-1-richard.henderson@linaro.org> References: <20171016172609.23422-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::22e Subject: [Qemu-devel] [PATCH v6 47/50] 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: cota@braap.org 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..1231f9f876 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 %ld", + __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;