From nobody Tue Oct 25 15:17:05 2022 X-Original-To: dev-commits-src-main@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 4MxbC56bTFz4g4hV; Tue, 25 Oct 2022 15:17:05 +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 4MxbC563jBz3xSC; Tue, 25 Oct 2022 15:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666711025; 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=WG7EklX+IUCHLRZMgFPoh3JaHf7ZqPHPrxmU8+cbeYQ=; b=C3sGWiMM8xZ0vqr3emk03a8f9oTsLnec97HnYvekSlMQ/1zygb2iHsDgY5w89kGK5kLuNr KCSzUEIAJqQnc9NNaj1oGTHCKLKe7Qxt8LB2b5xrXRCpvXKlwDIa1Y487FdFPnZZQvEWHc 2cvHk7GqJuAERPrqDld0YLIltOIOG8AwbAnOTvREMLcRZtlcwPQgCqAn2Q6XBtMxU6QYaR osEkKqNv0K9vapQJTCr7E44MkBRMKXKSD4diPEgYuKVP8+fdPBSa5CfpoldagtK7XU2b4A vdbXyB4K2r32oU/kdksbi+eOyPvAXdEbKOBCGnCtVHPshmDpNI2cpXfTICdwOw== 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 4MxbC55953zj6f; Tue, 25 Oct 2022 15:17: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 29PFH5PA023165; Tue, 25 Oct 2022 15:17:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29PFH5qQ023164; Tue, 25 Oct 2022 15:17:05 GMT (envelope-from git) Date: Tue, 25 Oct 2022 15:17:05 GMT Message-Id: <202210251517.29PFH5qQ023164@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: 03f7ccab3207 - main - bhyve: Avoid arithmetic on void pointers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 03f7ccab32078467ff0df14c7996747269a1962c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666711025; 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=WG7EklX+IUCHLRZMgFPoh3JaHf7ZqPHPrxmU8+cbeYQ=; b=pAMJSR0yl5/EXMrFUiSLQKJiFUckVp95qt6doK15xsjWTETxEUJ/LsZkqTvGpY+1ZlaRJr kYlXfEwue4UNYIlm+vVkzJxE4OySgkN3tSYAKwMM9k3RRw3utIsT6ZyghNLPLNgxM/ProU 8fNvb1JJT0KTiGFVBIzd6UV3kMSShHU6t8QfQpGNmB7ubiLa8q8e59QE3fIhAH1HAga6lT lHaTrf2nmToDpf0HbO11T7Hd2Vk5+1BeMw5n5S5Nv5ly+sKqoZXMdlV8suf9yo2fG/IpVI k87heAbglEOOcs/tOx5e/9x4t8DaSQzTe6D3h5C6BYmAM2AHyDyqZ/PdEGQc9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666711025; a=rsa-sha256; cv=none; b=w5BQh7D4GrFDLjEi/eqGKq3VudhACOpjuw6oR4hTJyIaiFgBE6dTn/cEuQ0PucaioemEf8 FyFADI9VKOD1McQ0UGndxXzllg5D6C9TjJmw77UlKoH0wZOWjA35cWdxW3cXyMrSWQe1Th WZ3EEkK7f3FxAe+EXsodgwX9Foev9KbJHNyJ0ttRiCn8AtvVeat41lkYIz53k4ecZoPNEI qsegUCiqqfET73zFmJT8FjLkDn6J2Dmj8uPUb9Ff8BCyTArxR/WxvkNN5plbT/yCi0VwPB eK0cnMcawuMwm0wMjZVOG+uXaOeV8zjmG3JI5a0QK/aPudZ6HiJVw4uX0eKvww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=03f7ccab32078467ff0df14c7996747269a1962c commit 03f7ccab32078467ff0df14c7996747269a1962c Author: Mark Johnston AuthorDate: 2022-10-25 13:07:14 +0000 Commit: Mark Johnston CommitDate: 2022-10-25 15:16:56 +0000 bhyve: Avoid arithmetic on void pointers No functional change intended. MFC after: 1 week --- usr.sbin/bhyve/block_if.c | 5 +++-- usr.sbin/bhyve/net_backends.c | 2 +- usr.sbin/bhyve/pci_ahci.c | 10 ++++------ usr.sbin/bhyve/pci_e82545.c | 3 ++- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c index 84877927b53e..b22ca140a80e 100644 --- a/usr.sbin/bhyve/block_if.c +++ b/usr.sbin/bhyve/block_if.c @@ -266,7 +266,7 @@ blockif_proc(struct blockif_ctxt *bc, struct blockif_elem *be, uint8_t *buf) do { clen = MIN(len - boff, br->br_iov[i].iov_len - voff); - memcpy(br->br_iov[i].iov_base + voff, + memcpy((uint8_t *)br->br_iov[i].iov_base + voff, buf + boff, clen); if (clen < br->br_iov[i].iov_len - voff) voff += clen; @@ -302,7 +302,8 @@ blockif_proc(struct blockif_ctxt *bc, struct blockif_elem *be, uint8_t *buf) clen = MIN(len - boff, br->br_iov[i].iov_len - voff); memcpy(buf + boff, - br->br_iov[i].iov_base + voff, clen); + (uint8_t *)br->br_iov[i].iov_base + voff, + clen); if (clen < br->br_iov[i].iov_len - voff) voff += clen; else { diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index 8c6b226a455d..b5d320187088 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -738,7 +738,7 @@ netmap_send(struct net_backend *be, const struct iovec *iov, int nm_buf_size; int nm_buf_len; uint32_t head; - void *nm_buf; + uint8_t *nm_buf; int j; ring = priv->tx; diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c index 0d8cc3995711..d4000b7a63c6 100644 --- a/usr.sbin/bhyve/pci_ahci.c +++ b/usr.sbin/bhyve/pci_ahci.c @@ -785,12 +785,11 @@ ahci_handle_flush(struct ahci_port *p, int slot, uint8_t *cfis) } static inline void -read_prdt(struct ahci_port *p, int slot, uint8_t *cfis, - void *buf, int size) +read_prdt(struct ahci_port *p, int slot, uint8_t *cfis, void *buf, int size) { struct ahci_cmd_hdr *hdr; struct ahci_prdt_entry *prdt; - void *to; + uint8_t *to; int i, len; hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); @@ -899,12 +898,11 @@ next: } static inline void -write_prdt(struct ahci_port *p, int slot, uint8_t *cfis, - void *buf, int size) +write_prdt(struct ahci_port *p, int slot, uint8_t *cfis, void *buf, int size) { struct ahci_cmd_hdr *hdr; struct ahci_prdt_entry *prdt; - void *from; + uint8_t *from; int i, len; hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); diff --git a/usr.sbin/bhyve/pci_e82545.c b/usr.sbin/bhyve/pci_e82545.c index 5b95b2d8318c..1591136002f6 100644 --- a/usr.sbin/bhyve/pci_e82545.c +++ b/usr.sbin/bhyve/pci_e82545.c @@ -1394,7 +1394,8 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail, /* Include respective part of payload IOV. */ for (nleft = now; pv < iovcnt && nleft > 0; nleft -= nnow) { nnow = MIN(nleft, iov[pv].iov_len - pvoff); - tiov[tiovcnt].iov_base = iov[pv].iov_base + pvoff; + tiov[tiovcnt].iov_base = (uint8_t *)iov[pv].iov_base + + pvoff; tiov[tiovcnt++].iov_len = nnow; if (pvoff + nnow == iov[pv].iov_len) { pv++;