From nobody Thu Oct 5 17:37:21 2023 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 4S1dzk2Bssz4w95p; Thu, 5 Oct 2023 17:37:22 +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 4S1dzk1jRdz4CYN; Thu, 5 Oct 2023 17:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696527442; 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=k0OwbQx3KeWM9EIVj8U9llZR7zaKJmmPkGyYa+vCSbo=; b=PNkSg2y1CrPi+cX9UaKqH470+fYSpgUwiifmnjs30o209GOnTghB0lce3cAMK7JPSdSr4Z hnI04SKPJZ2Z9/g4Y43VmFFxEVg2prD6BTZKShZbwuSPkErLhZdUs+1arcbpZZaNfbvoj8 Z3NLyUU9HQ7Ws9ylE5CbijrAIo/dKQJnoMjkAEN6A+sRMa4kOsJYKTjFBjjU8WMB9hEmHL dQcooHv9ohf4qxDzDXtkADWli4r3wFme2lUPdDZpC9r398Txn/Nm6CuL/rT4E1XFgQ1wKR ZKq+/bwQa2tiPnNyHcmi96HaKx2B+Vkfs92aduFl2yzydhTjEw9TNwJWIBHKAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696527442; a=rsa-sha256; cv=none; b=cDaZRKrfl3e91pjnHhBmuDC+BQjL0FGvdFR6jZb1rrH63eS0UptKnfSNh9o6F9smydo7VN PciJv6xy+1RYBQodXKwh6LGZs4nTdtYfNsPqLakoQAhPKYlQ2FERNYyd23BjVIersXsA/g Dd5DGHO5zb3jEmPq951iPxmB9S7hAXihfEu+FiSNCjTevZNpJMipeCLjuHUay7fE/0YNhX vnUjRBHsEVPE6/eDgAk6oEVvCcHPbDTxh9+wPL+ClQvZ0lPtOINOWFeBnsWJsWofzDTi3S QVY2FmpiFEqZXjrllLv2EZebpTgoylOigIYuBEkDWCEEZh3xwzlVqZ39Nc3HcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696527442; 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=k0OwbQx3KeWM9EIVj8U9llZR7zaKJmmPkGyYa+vCSbo=; b=pXjOEFiKz8MsqhWji56lPdUhGauV+YnTN+LGSHbbihgDX+CRDVi8wZUboPlNg7f1PihHPG 5lTDxjVHWbjL7mviWcdNFjzKkdGen6pMdzyjQLBEzhgWFfdhqpd0bYxFw6Mk51hVvJRBvY KMJG76OueT4SgOPit3FW+P6urD60ULaabtU84wOeaR5Xl+7qGWiNAPT21tISvkW6zO+xzS x7W51tnLP7v/htjZ6jpBxPIxtaEFmHrmOkQH6Ai2Dq+MmWsasU1/rftaANJRsvRnv2DHD0 48tU8+pLzEfLwy/NvAZ+PtL+GdHUGW9rG460cqg/Jy0rjwuWmlg4OFcemJ3ruw== 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 4S1dzk0fgGzZf; Thu, 5 Oct 2023 17:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395HbLrO015024; Thu, 5 Oct 2023 17:37:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395HbLJZ015021; Thu, 5 Oct 2023 17:37:21 GMT (envelope-from git) Date: Thu, 5 Oct 2023 17:37:21 GMT Message-Id: <202310051737.395HbLJZ015021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 51426ad9c75b - stable/13 - mprutil: "fix user reply buffer (64)..." warnings 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 51426ad9c75b21424a05208a0c3d122beb08ddd7 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=51426ad9c75b21424a05208a0c3d122beb08ddd7 commit 51426ad9c75b21424a05208a0c3d122beb08ddd7 Author: Alan Somers AuthorDate: 2023-02-22 22:06:43 +0000 Commit: Alan Somers CommitDate: 2023-10-05 17:35:27 +0000 mprutil: "fix user reply buffer (64)..." warnings Depending on the card's firmware version, it may return different length responses for MPI2_FUNCTION_IOC_FACTS. But the first part of the response contains the length of the rest, so query it first to get the length and then use that to size the buffer for the full response. Also, correctly zero-initialize MPI2_IOC_FACTS_REQUEST. It only worked by luck before. PR: 264848 Reported by: Julien Cigar Sponsored by: Axcient Reviewed by: scottl, imp Differential Revision: https://reviews.freebsd.org/D38739 (cherry picked from commit 7d154c4dc64e61af7ca536c4e9927fa07c675a83) --- sys/dev/mpr/mpr.c | 2 +- sys/dev/mpr/mpr_user.c | 4 ++-- sys/dev/mps/mps.c | 2 +- sys/dev/mps/mps_user.c | 4 ++-- usr.sbin/mpsutil/mps_cmd.c | 40 +++++++++++++++++++++++++++------------- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/sys/dev/mpr/mpr.c b/sys/dev/mpr/mpr.c index 6d41b77b1182..161914748e56 100644 --- a/sys/dev/mpr/mpr.c +++ b/sys/dev/mpr/mpr.c @@ -1871,7 +1871,7 @@ mpr_setup_sysctl(struct mpr_softc *sc) SYSCTL_ADD_STRING(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "msg_version", CTLFLAG_RD, sc->msg_version, - strlen(sc->msg_version), "message interface version"); + strlen(sc->msg_version), "message interface version (deprecated)"); SYSCTL_ADD_INT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "io_cmds_active", CTLFLAG_RD, diff --git a/sys/dev/mpr/mpr_user.c b/sys/dev/mpr/mpr_user.c index d9dc3d2377a2..f2847ae36d66 100644 --- a/sys/dev/mpr/mpr_user.c +++ b/sys/dev/mpr/mpr_user.c @@ -852,7 +852,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; - if (sz > data->ReplySize) { + if (bootverbose && sz > data->ReplySize) { mpr_printf(sc, "%s: user reply buffer (%d) " "smaller than returned buffer (%d)\n", __func__, data->ReplySize, sz); @@ -1077,7 +1077,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; - if (sz > data->ReplySize) { + if (bootverbose && sz > data->ReplySize) { mpr_printf(sc, "%s: user reply buffer (%d) smaller " "than returned buffer (%d)\n", __func__, data->ReplySize, sz); diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c index a312e95df771..10aea28db9ee 100644 --- a/sys/dev/mps/mps.c +++ b/sys/dev/mps/mps.c @@ -1716,7 +1716,7 @@ mps_setup_sysctl(struct mps_softc *sc) SYSCTL_ADD_STRING(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "msg_version", CTLFLAG_RD, sc->msg_version, - strlen(sc->msg_version), "message interface version"); + strlen(sc->msg_version), "message interface version (deprecated)"); SYSCTL_ADD_INT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "io_cmds_active", CTLFLAG_RD, diff --git a/sys/dev/mps/mps_user.c b/sys/dev/mps/mps_user.c index a1ee620c713a..49dc0f05619c 100644 --- a/sys/dev/mps/mps_user.c +++ b/sys/dev/mps/mps_user.c @@ -863,7 +863,7 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; - if (sz > data->ReplySize) { + if (bootverbose && sz > data->ReplySize) { mps_printf(sc, "%s: user reply buffer (%d) " "smaller than returned buffer (%d)\n", __func__, data->ReplySize, sz); @@ -1017,7 +1017,7 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; - if (sz > data->ReplySize) { + if (bootverbose && sz > data->ReplySize) { mps_printf(sc, "%s: user reply buffer (%d) smaller " "than returned buffer (%d)\n", __func__, data->ReplySize, sz); diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c index 448e4cea602f..2101bbba73b0 100644 --- a/usr.sbin/mpsutil/mps_cmd.c +++ b/usr.sbin/mpsutil/mps_cmd.c @@ -721,25 +721,39 @@ mps_pass_command(int fd, void *req, uint32_t req_len, void *reply, return (0); } +/* Return the length in bytes of the device's MPI2_IOC_FACTS reply */ +static size_t +mps_get_ioc_factslen(int fd) +{ + MPI2_IOC_FACTS_REQUEST req; + const size_t factslen = 4; + char factsbuf[4] = {0}; + MPI2_IOC_FACTS_REPLY *facts = (MPI2_IOC_FACTS_REPLY*)factsbuf; + int error; + + bzero(&req, sizeof(req)); + req.Function = MPI2_FUNCTION_IOC_FACTS; + error = mps_pass_command(fd, &req, sizeof(MPI2_IOC_FACTS_REQUEST), + factsbuf, factslen, NULL, 0, NULL, 0, 10); + + if (error) + return (0); + + /* The card's response is measured in dwords */ + return (facts->MsgLength * 4); +} + MPI2_IOC_FACTS_REPLY * mps_get_iocfacts(int fd) { MPI2_IOC_FACTS_REPLY *facts; MPI2_IOC_FACTS_REQUEST req; - char msgver[8], sysctlname[128]; - size_t len, factslen; + size_t factslen; int error; - snprintf(sysctlname, sizeof(sysctlname), "dev.%s.%d.msg_version", - is_mps ? "mps" : "mpr", mps_unit); - - factslen = sizeof(MPI2_IOC_FACTS_REPLY); - len = sizeof(msgver); - error = sysctlbyname(sysctlname, msgver, &len, NULL, 0); - if (error == 0) { - if (strncmp(msgver, "2.6", sizeof(msgver)) == 0) - factslen += 4; - } + factslen = mps_get_ioc_factslen(fd); + if (factslen == 0) + return (NULL); facts = malloc(factslen); if (facts == NULL) { @@ -747,7 +761,7 @@ mps_get_iocfacts(int fd) return (NULL); } - bzero(&req, factslen); + bzero(&req, sizeof(req)); req.Function = MPI2_FUNCTION_IOC_FACTS; #if 1