From owner-freebsd-emulation@freebsd.org Thu Aug 13 22:09:28 2020 Return-Path: Delivered-To: freebsd-emulation@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF0133ADFFC for ; Thu, 13 Aug 2020 22:09:28 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4BSLMX5QCDz3fMY for ; Thu, 13 Aug 2020 22:09:28 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id B81DB3AE21C; Thu, 13 Aug 2020 22:09:28 +0000 (UTC) Delivered-To: emulation@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B7DF73AE1BD for ; Thu, 13 Aug 2020 22:09:28 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BSLMX3WMxz3fPM for ; Thu, 13 Aug 2020 22:09:28 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: by freefall.freebsd.org (Postfix) id 621D61CD7E; Thu, 13 Aug 2020 22:09:28 +0000 (UTC) Delivered-To: vbox@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 584241CD7D; Thu, 13 Aug 2020 22:09:28 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BSLMX1B8jz3fH7; Thu, 13 Aug 2020 22:09:28 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from freefall.freebsd.org (pool-100-8-53-238.nwrknj.fios.verizon.net [100.8.53.238]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jkim/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id EB16F189C1; Thu, 13 Aug 2020 22:09:27 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Subject: Re: Old bug in patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c To: Martin Simmons , "Mikhail T." Cc: mmokhi@FreeBSD.org, vbox@FreeBSD.org References: <101fc234-e5c2-e8c3-9c07-3eb922c01736@aldan.algebra.com> <202006231847.05NIl6eH007223@higson.cam.lispworks.com> From: Jung-uk Kim Autocrypt: addr=jkim@FreeBSD.org; keydata= mQENBFJBztUBCAChqNyGqmFuNo0U7MBzsD+q/G6Cv0l7LGVrOAsgh34M8wIWhD+tztDWMVfn AhxNDd0ceCj2bYOe67sTQxAScEcbt2FfvPOLp9MEXb9qohZj172Gwkk7dnhOhZZKhVGVZKM4 NcsuBDUzgf4f3Vdzj4wg6WlqplnTZo8lPE4hZWvZHoFIyunPTJWenybeV1xnxK7JkUdSvQR0 fA59RfTTECMwTrSEfYGUnxIDBraxJ7Ecs/0hGQ7sljIj8WBvlRDU5fU1xfF35aw56T8POQRq F4E6RVJW3YGuTpSwgtGZOTfygcLRhAiq3dFC3JNLaTVTpM8PjOinJyt9AU6RoITGOKwDABEB AAG0Hkp1bmctdWsgS2ltIDxqa2ltQEZyZWVCU0Qub3JnPokBPQQTAQoAJwUCUkHO1QIbAwUJ E0/POwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRB8n5Ym/NvxRqyzB/wL7QtsIpeGfGIA ZPMtgXMucM3NWzomyQMln2j2efUkDKthzh9jBxgF53TjOr7imwIt0PT2k1bqctPrq5IRqnu9 mGroqaCLE3LG2/E3jEaao4k9PO6efwlioyivUo5NrqIQOQ4k3EAXw7d2y0Dk1VpTgdMrnUAB hj7lGlLqS4ydcrf24DdbCRGdEQwqd9DBeBgbWynxAJMgbZBhYVEyIHuQKkJ8qY0ibIPXXuF0 KYDeH0qUHtWV2K3srNyPtymUkBQD84Pl1GWRYx05XdUHDmnX0JV3lg0BfYJZgZv0ehPQrMfY Fd9abTkf9FHQYz1JtsC8wUuRgqElRd6+YAGf8Tt9uQENBFJBztUBCADLtSrP44El2VoJmH14 OFrlOgxzZnbn+Y/Gf1k12mJBiR+A+pBeRLD50p7AiTrjHRxO3cHcl9Dh0uf1VSbXgp8Or0ye iP/86fZPd4k5HXNmDTLL0HecPE08SCqGZ0W8vllQrokB1QxxRUB+fFMPJyMCjDAZ7P9fFTOS dTw1bJSTtOD8Sx8MpZUa9ti06bXFlVYDlaqSdgk181SSx+ZbSKkQR8CIMARlHwiLsa3Z9q9O EJr20HPyxe0AlTvwvFndH61hg7ds63eRvglwRnNON28VXO/lvKXq7Br/CiiyhFdKfINIx2Z5 htYq22tgGTW7mBURbIKoECFBTX9Lv6BXz6w9ABEBAAGJASUEGAEKAA8FAlJBztUCGwwFCRNP zzsACgkQfJ+WJvzb8UZcJQf+IsTCxUEqY7W/pT84sMg5/QD3s6ufTRncvq14fEOxCNq1Rf4Q 9P+tOFa8GZfKDGB2BFGIrW7uT5mlmKdK1vO6ZIA930y5kUsnCmBUEBJkE2ciSQk01aB/1o62 Q3Gk/F6BwtNY9OXiqF7AcAo+K/BMIaqb26QKeh+IIgK1NN9dQiq3ByTbl4zpGZa6MmsnnRTu mzGKt2nkz7vBzH6+hZp1OzGZikgjjhYWVFoJo1dvf/rv4obs0ZJEqFPQs/1Qa1dbkKBv6odB XJpPH0ssOluTY24d1XxTiKTwmWvHeQkOKRAIfD7VTtF4TesoZYkf7hsh3e3VwXhptSLFnEOi WwYofg== Organization: FreeBSD.org Message-ID: <9fe11d97-7c73-1c0f-a318-3553e2bfb2b0@FreeBSD.org> Date: Thu, 13 Aug 2020 18:09:27 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <202006231847.05NIl6eH007223@higson.cam.lispworks.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2020 22:09:28 -0000 On 20. 6. 23., Martin Simmons wrote: > Is the memcpy wrong too? It looks like fsinfo.serial is a single uint32_t > (i.e. 32 bits), but mp->mnt_stat.f_fsid is a pair of int32_t (i.e. 64 bits), > so copying this pair from fsinfo.serial is wrong. You're right. I just committed a fix (r544846). Sorry for the late response. Jung-uk Kim >>>>>> On Mon, 22 Jun 2020 14:22:05 -0400, Mikhail T said: >> >> Gentlemen! >> >> An old bug in the patch is causing compiler-warnings, and leads to >> erroneous behavior where pointers are bigger than 32-bit. >> >> Moreover, given the memcpy right after it, the bzero is simply not >> needed at all. Instead of removing the bogus ampersand, the entire line >> should be deleted. (I would've replaced the memcpy with an assignment >> too, but that's not as pressing.) >> >> Can I commit this? >> >> Index: files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c >> =================================================================== >> --- files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c >> (revision 539883) >> +++ files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c >> (working copy) >> @@ -11,7 +11,7 @@ >>    * >>    * This file is part of VirtualBox Open Source Edition (OSE), as >>    * available from http://www.virtualbox.org. This file is free >> software; >> -@@ -14,245 +9,479 @@ >> +@@ -14,245 +9,478 @@ >>    * VirtualBox OSE distribution. VirtualBox OSE is distributed in the >>    * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. >>    */ >> @@ -466,7 +466,6 @@ >>  + >>  +      MNT_ILOCK(mp); >>  +      mp->mnt_data = vboxfsmp; >> *-+      bzero(&mp->mnt_stat.f_fsid, sizeof(&mp->mnt_stat.f_fsid));* >>  +      /* f_fsid is int32_t but serial is uint32_t, convert */ >>  +      memcpy(&mp->mnt_stat.f_fsid, &fsinfo.serial, >> sizeof(mp->mnt_stat.f_fsid)); >>  +      mp->mnt_flag |= MNT_LOCAL;