From patchwork Tue Mar 6 19:34:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 882200 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A3sDQog0"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zwn6x4RVZz9sgt for ; Wed, 7 Mar 2018 06:35:20 +1100 (AEDT) Received: from localhost ([::1]:57752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etIMl-0000sJ-Lo for incoming@patchwork.ozlabs.org; Tue, 06 Mar 2018 14:35:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etIMI-0000r2-RC for qemu-devel@nongnu.org; Tue, 06 Mar 2018 14:34:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etIMH-0005UL-KY for qemu-devel@nongnu.org; Tue, 06 Mar 2018 14:34:46 -0500 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:39718) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1etIMH-0005U2-8s; Tue, 06 Mar 2018 14:34:45 -0500 Received: by mail-lf0-x244.google.com with SMTP id f75so30248685lfg.6; Tue, 06 Mar 2018 11:34:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mr9Dl8q0RJ6zYHf+j3Kq9v89WEbOkD2UEsIOc0L2THk=; b=A3sDQog0Ah275FuTCbHSqO6raveCF+71cq4lPa/lWOOEStuzmhfostVm5Jqz4HXpFh B+DDYWrE1KGrMZerIrJRKqxTFVzGMO9WiWUSJWd+XLRXLVzDahsxEVHXQhTvXr0qasqL 2mdWfC0yp1bLtdpqyDIucDxrBTteGwM2yaYY9wmQx5v6UPdkz4mPptiEti4cQPC2udxy A5dU0x7aOJUeFZ310XVaaAv+2LEoj37Zjr+iiaWWZaL9tE5DBzFP3xHGkTJfHH206k+4 gJpAAu6GQFTuOCyJz4tGA0Wg8yxFj9f+tSgpia0KHHJxWSc7Vzqj1K796De/ER+lwudj B2dw== 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; bh=mr9Dl8q0RJ6zYHf+j3Kq9v89WEbOkD2UEsIOc0L2THk=; b=rpKXm+6uiu6w+JLBzewnHpBNDMZ74Lz4K5HakqopTp7ncjpncL2gcYwHXpe+4HhAMq k0XN0e6yF1lswbBmG9dGn0q3ZmWwkGFU0KDE2sI01nkIzED7mxP78k6ZHgxAbJEflc2y ugXT3Rx5mYHMbKVfFxhLEyPyTksFUM38f7Qz5pMw76VozoXa1NQIcG0dCPsOjURxlOJq 2tItHvALovqlHbuomw+oGUW/f16Gybt0Kod5rCjuQIx3hmVHlWNOjUpkyQsUdNLVC9sg MhygNq5pwWn3v5m8x7VLmcwTPrwmbOVAxPHjWpCGWyihJZe8KEtsq7rr1Bt7FJN3Eoah uDsA== X-Gm-Message-State: AElRT7Hx9zILDX0ZX7KesUxess2QRkAjckuXM+Uks2UfdMbc2+0vAxv6 C/7iTz7buUXayntojE/lln29pQ== X-Google-Smtp-Source: AG47ELsDyxJ8zrFoUNNol+20ikC+8Z05tpN0NNDypdtcxi0qdeMor2xbiilvWXzIp3LYc1aEHPQb6w== X-Received: by 10.25.0.19 with SMTP id 19mr13385882lfa.69.1520364883690; Tue, 06 Mar 2018 11:34:43 -0800 (PST) Received: from octofox.cadence.com (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id r84sm3241185lje.76.2018.03.06.11.34.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Mar 2018 11:34:42 -0800 (PST) From: Max Filippov To: qemu-devel@nongnu.org Date: Tue, 6 Mar 2018 11:34:18 -0800 Message-Id: <20180306193418.28095-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::244 Subject: [Qemu-devel] [PATCH v4 05/11] linux-user: fix mmap/munmap/mprotect/mremap/shmat 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: Max Filippov , Riku Voipio , qemu-stable@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In linux-user QEMU that runs for a target with TARGET_ABI_BITS bigger than L1_MAP_ADDR_SPACE_BITS an assertion in page_set_flags fires when mmap, munmap, mprotect, mremap or shmat is called for an address outside the guest address space. mmap and mprotect should return ENOMEM in such case. Introduce macro guest_range_valid that verifies if address range is within guest address space and does not wrap around. Use that macro in mmap/munmap/mprotect/mremap/shmat for error checking. Cc: qemu-stable@nongnu.org Cc: Riku Voipio Cc: Laurent Vivier Signed-off-by: Max Filippov --- Changes v3->v4: - change GUEST_ADDR_MAX and h2g_valid definitions as suggested by Laurent Vivier. Changes v2->v3: - fix comparison in guest_valid: it must be 'less' to preserve the existing functionality, not 'less or equal'. - fix guest_range_valid: it may not use guest_valid, because single range that occupies all of the guest address space is valid. include/exec/cpu-all.h | 4 ++++ include/exec/cpu_ldst.h | 14 ++++++++------ linux-user/mmap.c | 20 +++++++++++++++----- linux-user/syscall.c | 3 +++ 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 0b141683f095..6304cfa7e171 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -159,8 +159,12 @@ extern unsigned long guest_base; extern int have_guest_base; extern unsigned long reserved_va; +#if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS +#define GUEST_ADDR_MAX (reserved_va ? reserved_va : ~0ul) +#else #define GUEST_ADDR_MAX (reserved_va ? reserved_va : \ (1ul << TARGET_VIRT_ADDR_SPACE_BITS) - 1) +#endif #else #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 191f2e962a3c..22f5df9c8a92 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -52,15 +52,17 @@ #define g2h(x) ((void *)((unsigned long)(target_ulong)(x) + guest_base)) #if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS -#define h2g_valid(x) 1 +#define guest_valid(x) 1 #else -#define h2g_valid(x) ({ \ - unsigned long __guest = (unsigned long)(x) - guest_base; \ - (__guest < (1ul << TARGET_VIRT_ADDR_SPACE_BITS)) && \ - (!reserved_va || (__guest < reserved_va)); \ -}) +#define guest_valid(x) ((x) < GUEST_ADDR_MAX) #endif +#define h2g_valid(x) guest_valid((unsigned long)(x) - guest_base) + +#define guest_range_valid(start, len) \ + ({unsigned long l = (len); \ + l <= GUEST_ADDR_MAX && (start) <= GUEST_ADDR_MAX - l; }) + #define h2g_nocheck(x) ({ \ unsigned long __ret = (unsigned long)(x) - guest_base; \ (abi_ulong)__ret; \ diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 0fbfd6dff20d..df81f9b803b6 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -80,8 +80,9 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) return -EINVAL; len = TARGET_PAGE_ALIGN(len); end = start + len; - if (end < start) - return -EINVAL; + if (!guest_range_valid(start, len)) { + return -ENOMEM; + } prot &= PROT_READ | PROT_WRITE | PROT_EXEC; if (len == 0) return 0; @@ -481,8 +482,8 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, * It can fail only on 64-bit host with 32-bit target. * On any other target/host host mmap() handles this error correctly. */ - if ((unsigned long)start + len - 1 > (abi_ulong) -1) { - errno = EINVAL; + if (!guest_range_valid(start, len)) { + errno = ENOMEM; goto fail; } @@ -622,8 +623,10 @@ int target_munmap(abi_ulong start, abi_ulong len) if (start & ~TARGET_PAGE_MASK) return -EINVAL; len = TARGET_PAGE_ALIGN(len); - if (len == 0) + if (len == 0 || !guest_range_valid(start, len)) { return -EINVAL; + } + mmap_lock(); end = start + len; real_start = start & qemu_host_page_mask; @@ -678,6 +681,13 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, int prot; void *host_addr; + if (!guest_range_valid(old_addr, old_size) || + ((flags & MREMAP_FIXED) && + !guest_range_valid(new_addr, new_size))) { + errno = ENOMEM; + return -1; + } + mmap_lock(); if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e24f43c4a259..79245e73784f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4900,6 +4900,9 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } + if (!guest_range_valid(shmaddr, shm_info.shm_segsz)) { + return -TARGET_EINVAL; + } mmap_lock();