From nobody Fri Nov 11 15:04:05 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N826G0h9jz4dtZD; Fri, 11 Nov 2022 15:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N826G06TSz4Gr9; Fri, 11 Nov 2022 15:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668179046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nVVJG3ajO4keGUeR6czMCicFm08xHefGrRw8tOFn76k=; b=oiCixaeKZzc9Q7uKbhYkKW7CfMgrXs0TrPNT4MX5oGSi28NIaVjl47wk/vnXhaWZbyQdqC W4aQxfARu/7aEhmmntrKKfclHSCRu3UAciQBDrZyCbf2enf7DeQ1oUnVla570jckiju+B+ nExipi5sM0uG0yDpzf9T2vVlhQky+5TKDsIFeru9sHwnfy3WKVm3c80opnj6+98WqPCy9D bDIpRo03QvotIPv+BlcwIVXKYIk3AgePiRsGFbazVfHyqZ/OZbLU2GxQGQuYkAsFWk84Ci X+35KQDkTUhvwCNzEIU2pos9kWEeGlcFBDbe5sN7vLVdrz5MY4T9ViGeGrD2PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668179046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nVVJG3ajO4keGUeR6czMCicFm08xHefGrRw8tOFn76k=; b=mnyWdwuDqKcv3eYDMoHbMriob5UqgT9prTS7LaGSWWbiinHpp6vbbsnYGeZow7sIxq+7a3 bdh7saPi4G5aH5dOOAhSqseK7+Kf4Hipe2gHO0mclQfgSF+nwG1ik1PVTZqqAoZSO4m4Xy 14SD8a0LYxVhpVzjk4LwYYOj7tqEd4WXtzKe+GmZbB+C9fJfjLCDqJHKFVxJsQ2LZqs5h8 fVjghFEdQiWhNJ63DyVN+lEvuY9xiwfQYh9kAlpvuVkdTKZuNZPdqmeMEJRHvOySfOOkuj cRavyL7g6jLW2JFQcWdJY/UC8sVFIvloBypL7cG6RyAYQHTIRZCdMN7vJWiRbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668179046; a=rsa-sha256; cv=none; b=KycN4OIWlMzpQtyDF8V+omOywS7EheFBinWIDL2aCu0Zsq36pIdGyg7qYP3rg3AgiCV6F5 363uSUydTWhF3XYjo9ObFiJrVr0kAj7Byl79go509VhBpzyWXcjNZb4UW2t0CdhpXL/SWu c0UniphkG0nVqxrfteTgmw+SKarZqPG8DDSe0hG8Hpkd1hccdz38TUY0sl7EaKeFD+sFtP tE+fBMEzRMrse21sNvAZHvpq135JbRGL+bHfikmuAbLHCXinpfKi2uOcOulPb3Dv45zoQv 8/Xk9FmT9NrwuMAADADIELfEB3giJVXo6ceU6Oj+F2sLcRZsc801dALMkb5xEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N826F6GDlzmDv; Fri, 11 Nov 2022 15:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ABF4592094114; Fri, 11 Nov 2022 15:04:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABF45I4094113; Fri, 11 Nov 2022 15:04:05 GMT (envelope-from git) Date: Fri, 11 Nov 2022 15:04:05 GMT Message-Id: <202211111504.2ABF45I4094113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f64f34380925 - main - bhyve: Address warnings about potential unaligned accesses in fwctl.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f64f34380925a4ddaf1c140c35f46408b74110ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f64f34380925a4ddaf1c140c35f46408b74110ac commit f64f34380925a4ddaf1c140c35f46408b74110ac Author: Mark Johnston AuthorDate: 2022-11-11 15:01:27 +0000 Commit: Mark Johnston CommitDate: 2022-11-11 15:01:27 +0000 bhyve: Address warnings about potential unaligned accesses in fwctl.c This silences some warning about potential unaligned accesses. No functional change intended. MFC after: 1 week Reviewed by: corvink, jhb Differential Revision: https://reviews.freebsd.org/D37288 --- usr.sbin/bhyve/fwctl.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c index 46010513b66a..f74380a426b2 100644 --- a/usr.sbin/bhyve/fwctl.c +++ b/usr.sbin/bhyve/fwctl.c @@ -88,20 +88,17 @@ static struct op_info *ops[OP_MAX+1]; /* Return 0-padded uint32_t */ static uint32_t -fwctl_send_rest(uint32_t *data, size_t len) +fwctl_send_rest(uint8_t *data, size_t len) { union { uint8_t c[4]; uint32_t w; } u; - uint8_t *cdata; size_t i; - cdata = (uint8_t *) data; u.w = 0; - - for (i = 0, u.w = 0; i < len; i++) - u.c[i] = *cdata++; + for (i = 0; i < len; i++) + u.c[i] = *data++; return (u.w); } @@ -203,7 +200,7 @@ static void fget_data(uint32_t data, uint32_t len __unused) { - *((uint32_t *) &fget_str[fget_cnt]) = data; + memcpy(&fget_str[fget_cnt], &data, sizeof(data)); fget_cnt += sizeof(uint32_t); } @@ -401,7 +398,7 @@ fwctl_request(uint32_t value) static int fwctl_response(uint32_t *retval) { - uint32_t *dp; + uint8_t *dp; ssize_t remlen; switch(rinfo.resp_count) { @@ -425,10 +422,9 @@ fwctl_response(uint32_t *retval) break; default: remlen = rinfo.resp_size - rinfo.resp_off; - dp = (uint32_t *) - ((uint8_t *)rinfo.resp_biov->iov_base + rinfo.resp_off); + dp = (uint8_t *)rinfo.resp_biov->iov_base + rinfo.resp_off; if (remlen >= (ssize_t)sizeof(uint32_t)) { - *retval = *dp; + memcpy(retval, dp, sizeof(uint32_t)); } else if (remlen > 0) { *retval = fwctl_send_rest(dp, remlen); }