From nobody Tue Dec 26 02:04:34 2023 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 4SzdPZ4hYjz55KrC; Tue, 26 Dec 2023 02:04:34 +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 4SzdPZ2z7gz4Klf; Tue, 26 Dec 2023 02:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556274; 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=CWhjB9wH/Rtp5fx1ty+Z6vnimiA7qyz7XQRENjYQlh0=; b=hluXrdRsu0aGYXsO1An6mLpUF8ojq7MB55n9Tb/ei9LtH6oVzbfz9WWzXmbED7FISkAx4P qj/QeoR/SxbBMeCdxOml8yomYUjxiO80CwN6QNEXjcR9Q70lPGgrP+LAt9RTk2gCwfRY0+ FFGj4J9QLob24/5jry3/zQNgM9rBW38X1HIRDHO8pc1ptAt8wtmK2QQQK9vyyLC1NFfehJ pX1Z+3PSv2L2ZYzrj8hJ/FXzkPVM3Z6rvYp7PmHFvZhWvpgjHkIJuX81jAeEaBPiOMLgE0 HKuZWNJ0H8QMzwTdJBvRn27a9uNUhv8td0ezBHuLb0AFzabujZT1Mwe0eLPFCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556274; a=rsa-sha256; cv=none; b=RTQyQSO+gUW/NWJh2NW0LE1ak3IFwnp4Z1y49T+FvRtk9kuGiZBRz8gkhqy5dPkLADaKAp UprGYHDSy6vRe7E5SxdYfXGxeCezqe2MKG/9Bfp2529l+lbvrlGq7e4jd1u0mR5jzFcAMT SUK9SMIcpfow2fwfrEVTWzX/DbdlfqRn3f8xutEfqaFy+ld0PxGd06lZIvfVFG65OKE+jY jOQCKur6REbHt7opWb73pX0y3pBPOJwrY0T2iyKBk1WL+U7rTxQEb1JalTKCJVjhJaW/SB 7aQ8I/4eN3cKb03VVUvpjDwk+r3O3Gfo/Evzh43ArQFVy0whDTsNiAE60/Vw5g== 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=1703556274; 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=CWhjB9wH/Rtp5fx1ty+Z6vnimiA7qyz7XQRENjYQlh0=; b=vVU825C7Ef+RFrAMfuQKyhCJJ2mjmfP9ZsM89geVSUANKAIuamqBnOgIygN/X1loxpR3Iz YrBvOLSsyZPL2+EMqvEnIZpFKdmcIu75Tcf3PUdsamUuuOVTQpsqs2yoeREFMnFaMD7wP4 f6yPh7LwW4E8ijaEvidSymvUIIOE5JyyG8oPMcqnGHK4QxHNDMT933/Xsq2ezAi6uVmmQJ 9CEJOeyId8rm/daj1b4C6KlwRegQePynl5uYNWcPaggNN5gjO5Z02VvYvAEW9ZV6Kk8fYL x24cga/n4aboAlIdUZ+nuojcPGbWKrf1UPFhpKs7LV7Bzczmh2tJf27YxVm1Jg== 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 4SzdPZ24m1zbhF; Tue, 26 Dec 2023 02:04:34 +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 3BQ24YmG003658; Tue, 26 Dec 2023 02:04:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24YqR003655; Tue, 26 Dec 2023 02:04:34 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:34 GMT Message-Id: <202312260204.3BQ24YqR003655@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: 74e713804fa4 - main - iscsi: Check for copyout errors in iscsi_ioctl_daemon_receive() 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: 74e713804fa4767991c5f20e6b85da4235107122 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=74e713804fa4767991c5f20e6b85da4235107122 commit 74e713804fa4767991c5f20e6b85da4235107122 Author: Mark Johnston AuthorDate: 2023-12-26 01:43:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 iscsi: Check for copyout errors in iscsi_ioctl_daemon_receive() Reviewed by: jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43148 --- sys/dev/iscsi/iscsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c index 57292c6ff309..4ed8f086ccde 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -1896,17 +1896,17 @@ iscsi_ioctl_daemon_receive(struct iscsi_softc *sc, return (EMSGSIZE); } - copyout(ip->ip_bhs, idr->idr_bhs, sizeof(*ip->ip_bhs)); - if (ip->ip_data_len > 0) { + error = copyout(ip->ip_bhs, idr->idr_bhs, sizeof(*ip->ip_bhs)); + if (error == 0 && ip->ip_data_len > 0) { data = malloc(ip->ip_data_len, M_ISCSI, M_WAITOK); icl_pdu_get_data(ip, 0, data, ip->ip_data_len); - copyout(data, idr->idr_data_segment, ip->ip_data_len); + error = copyout(data, idr->idr_data_segment, ip->ip_data_len); free(data, M_ISCSI); } icl_pdu_free(ip); - return (0); + return (error); } #endif /* ICL_KERNEL_PROXY */