From owner-svn-soc-all@freebsd.org Fri Jul 10 17:19:23 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA4813406 for ; Fri, 10 Jul 2015 17:19:23 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A60C7E47 for ; Fri, 10 Jul 2015 17:19:23 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6AHJNUd045023 for ; Fri, 10 Jul 2015 17:19:23 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6AHJN8N045021 for svn-soc-all@FreeBSD.org; Fri, 10 Jul 2015 17:19:23 GMT (envelope-from mihai@FreeBSD.org) Date: Fri, 10 Jul 2015 17:19:23 GMT Message-Id: <201507101719.t6AHJN8N045021@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288193 - soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyveloadarm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jul 2015 17:19:23 -0000 Author: mihai Date: Fri Jul 10 17:19:22 2015 New Revision: 288193 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288193 Log: soc2015: mihai: bhyve: usr.sbin: bhyveloadarm: fix mmap bug - map ony readonly the file Modified: soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyveloadarm/bhyveloadarm.c Modified: soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyveloadarm/bhyveloadarm.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyveloadarm/bhyveloadarm.c Fri Jul 10 16:05:24 2015 (r288192) +++ soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyveloadarm/bhyveloadarm.c Fri Jul 10 17:19:22 2015 (r288193) @@ -41,7 +41,6 @@ guest_copyin(const void *from, uint64_t to, size_t size) { char *ptr; - ptr = vm_map_gpa(ctx, to, size); if (ptr == NULL) return (EFAULT); @@ -96,12 +95,14 @@ char kernel_image_name[KERNEL_IMAGE_NAME_LEN]; struct stat st; void *addr; + char test[4]; progname = basename(argv[0]); mem_size = 128 * MB; kernel_load_address = 0xc0000000; memory_base_address = 0xc0000000; + strncpy(kernel_image_name, "wfi.out", KERNEL_IMAGE_NAME_LEN); while ((opt = getopt(argc, argv, "k:l:b:m:")) != -1) { switch (opt) { @@ -154,20 +155,23 @@ exit(1); } - error = fstat(kernel_image_fd, &st); if (error) { perror("fstat"); exit(1); } - addr = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, kernel_image_fd, 0); - if (!addr) { + addr = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, kernel_image_fd, 0); + if (addr == MAP_FAILED) { perror("mmap kernel_image_fd"); exit(1); } - guest_copyin(addr, kernel_load_address, st.st_size); + if (guest_copyin(addr, kernel_load_address - memory_base_address, st.st_size)) { + perror("guest_copyin"); + exit(1); + } + munmap(addr, st.st_size); guest_setreg(VM_REG_GUEST_PC, kernel_load_address);