From nobody Tue Jan 02 00:37:11 2024 X-Original-To: dev-commits-src-branches@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 4T3v7W2X5lz55yWj; Tue, 2 Jan 2024 00:37:11 +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 4T3v7W1y8Xz3HDP; Tue, 2 Jan 2024 00:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704155831; 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=TtbdMiz5evS8QT7pK8JlCaZ1/QLWLXqNvyXPOR9hAkU=; b=eiBgVs3wajzkX2LnCnaUVhGIJTOY5vQ5XWTOpqExRQV0A5VdMyo8Pqz73ooZc+I4eBu0aD tib5rSO5scbk+/w52cELSun/BBpYYy5Rlb7zVr6fNgctDYak9+TNRIJZweA5Zd/GF2qzjR JSXuJaxwljvMYsxKQ5nppCi+Mz7bf7homdItXSPxuzebg4LBgACUJ1I7fJERyPZdmQDpJt 92t63s2lIpNiF/dt4ATDurbliYGc5KGEjBaSZCYvP2k/c/ZUgXAc6Qg1e1Zh9nmUOnolTN eSgG2o++mgI837OKaz3AGApp7SdgNfn0GOioLAO6whKrzWKwTP5e2iv6hF6G5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704155831; a=rsa-sha256; cv=none; b=cmZyS/bcze3d30j/JkWo3gMjogoxZ9P52jIammrpQjh90QqSYy7QKrg4azKqjLVShvl8GW WSlVNQk91geqrYQP2rNJdmSzx8TqeatcHjaOYu9R21XK2Gj4RlVzrAppM1a/wc/tICVn/+ yNJtoISCoDTfQrKgmzyCWSC8nRKnjQ4GMlp112ONbEdaY7WJZfckwvfKecfCKFw1GAJENW RUWQJCWcIIB8sFWDRWGM7KeEuzU6RI+YcwrSXo0iIN9JGqbu/FOSFMoFL4Uu+iZQGiTTS1 FvirlFFzvRur0nex1++K2/IqsHUamVS6PJIZmyJuRLKExV+LP/gTaQ6H1LbcYg== 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=1704155831; 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=TtbdMiz5evS8QT7pK8JlCaZ1/QLWLXqNvyXPOR9hAkU=; b=Z8frJvFVHn5o4rrlGlar2qbcsPpBfj5p1LNzSlCPCqr/ZXonYoZMz9fzhAqMqgzStVNGcM 6+Lp3JBQpsLVscHDlnl5YbHdMLJUm1o0RvCjfO8FAdJDrDMEZ3y6qzbkUnsLf2zozmIVI3 LUwW9kDzE+K1LW6reiLzO/f2LxJxbZZc/kfUK8H6PdiGQa18MHL+gsdglArs4RH3NCoL+B Vr+PcQPQ1IKDWUKKPvFxtms2V7bbvEOP3B5yCi94+7AYhbtgQlYc0dYGpC1GID8d2r7fN9 bFtO9Zom290toIF7lMXdRpCK0q6R0pquTZTMzrpiJ6BTOOm2FtDBkhKZjgZglQ== 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 4T3v7W12QYzfsf; Tue, 2 Jan 2024 00:37:11 +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 4020bBsB084850; Tue, 2 Jan 2024 00:37:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4020bBd5084847; Tue, 2 Jan 2024 00:37:11 GMT (envelope-from git) Date: Tue, 2 Jan 2024 00:37:11 GMT Message-Id: <202401020037.4020bBd5084847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9483388587a1 - stable/14 - ath: Handle errors from copyout() in ath_rate_fetch_node_stats() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9483388587a1348ff3a7d2feaff6fab6a9cd7446 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9483388587a1348ff3a7d2feaff6fab6a9cd7446 commit 9483388587a1348ff3a7d2feaff6fab6a9cd7446 Author: Mark Johnston AuthorDate: 2023-12-26 01:35:43 +0000 Commit: Mark Johnston CommitDate: 2024-01-02 00:29:39 +0000 ath: Handle errors from copyout() in ath_rate_fetch_node_stats() MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43096 (cherry picked from commit 711880597c6c4ac971eb2aba6a2dadb5933d38dd) --- sys/dev/ath/ath_rate/sample/sample.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/sys/dev/ath/ath_rate/sample/sample.c b/sys/dev/ath/ath_rate/sample/sample.c index 39ca5d1e9f31..8e70699f708d 100644 --- a/sys/dev/ath/ath_rate/sample/sample.c +++ b/sys/dev/ath/ath_rate/sample/sample.c @@ -1433,11 +1433,13 @@ ath_rate_fetch_node_stats(struct ath_softc *sc, struct ath_node *an, const HAL_RATE_TABLE *rt = sc->sc_currates; struct ath_rateioctl_tlv av; struct ath_rateioctl_rt *tv; - int y; + int error, y; int o = 0; ATH_NODE_LOCK_ASSERT(an); + error = 0; + /* * Ensure there's enough space for the statistics. */ @@ -1478,9 +1480,13 @@ ath_rate_fetch_node_stats(struct ath_softc *sc, struct ath_node *an, */ av.tlv_id = ATH_RATE_TLV_RATETABLE; av.tlv_len = sizeof(struct ath_rateioctl_rt); - copyout(&av, rs->buf + o, sizeof(struct ath_rateioctl_tlv)); + error = copyout(&av, rs->buf + o, sizeof(struct ath_rateioctl_tlv)); + if (error != 0) + goto out; o += sizeof(struct ath_rateioctl_tlv); - copyout(tv, rs->buf + o, sizeof(struct ath_rateioctl_rt)); + error = copyout(tv, rs->buf + o, sizeof(struct ath_rateioctl_rt)); + if (error != 0) + goto out; o += sizeof(struct ath_rateioctl_rt); /* @@ -1488,18 +1494,22 @@ ath_rate_fetch_node_stats(struct ath_softc *sc, struct ath_node *an, */ av.tlv_id = ATH_RATE_TLV_SAMPLENODE; av.tlv_len = sizeof(struct sample_node); - copyout(&av, rs->buf + o, sizeof(struct ath_rateioctl_tlv)); + error = copyout(&av, rs->buf + o, sizeof(struct ath_rateioctl_tlv)); + if (error != 0) + goto out; o += sizeof(struct ath_rateioctl_tlv); /* * Copy the statistics over to the provided buffer. */ - copyout(sn, rs->buf + o, sizeof(struct sample_node)); + error = copyout(sn, rs->buf + o, sizeof(struct sample_node)); + if (error != 0) + goto out; o += sizeof(struct sample_node); +out: free(tv, M_TEMP); - - return (0); + return (error); } static void