From nobody Thu Dec 28 02:58:11 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 4T0tVW35rGz550sr; Thu, 28 Dec 2023 02:58: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 4T0tVW28G9z3XtY; Thu, 28 Dec 2023 02:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703732291; 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=8kU7XT5n5jKjFmdmH8oV7k5hsv7tQm/48yBiDA+XgPs=; b=MjqslFItURBk7xOSb1RFoBf0w+XpHutJk1ya7Hr6BpU3xftz5xadE8VnV2qN2EBBhQhww7 ckRS1u3+KQ7DkGU6VmsS4HWkjyJ+aZMV/GHULQiYXdIl43gMek/WklMX6wK1SzvO2xVC/a 0oX0vLm6vvIK7hv5qIo+RGNxw+THlTfEPvnodtDdeqVVXGJY4DEOOMMhqIp8i4Tu5ZYAlS w6eBYSyM5Ytbc+dvME86/2cpdag+aA5c1nTm57TTefYvbxoahhbYHHIZZpj2g3NJSMjK3W eX5u7dM9agkCpYizUjohPKNtJtAcLIXH65jaiPmdSjshzCHzRQj48b09ZQrAjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703732291; a=rsa-sha256; cv=none; b=r3mGBqv39Tkfj1tbiIDtgwJ8m6VkMCSAbZ1cXbm2QIs+uNv3ZiA6WSm/ZGmA9L+uiWRl8D SFS9JUR0Xq6/S2sLd+oSeiUgwW+YzbTKF2WEvE8Gt3D5riam0P9oyHDSVCTzUQ5LczreYy Xz6Gvy4p0AcR6eJyy0iCFRQuv2NnolVK+HXnUNSp2Z0MJl+sexGhkmfJJWD8xUVCfAP66x Olv5zCaePGykxsG+kc1mPuQo1OrjuY/Tv3juuQke6XTYmY0X7aEhNF2wLxZtiz1ARvGLUc XOwsborzRHZmVRPdlVnB00XR/NLvoTWQjhk2jebGfq9+KziAwVsadp2urGdJjQ== 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=1703732291; 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=8kU7XT5n5jKjFmdmH8oV7k5hsv7tQm/48yBiDA+XgPs=; b=HQuuC6QH9ObTBbcGrDx9mI5OAegKtLP92WzK3QqmYsde/gGllcZO3m3R20+6mFQTrPzuNy 84NuKbHz6k+1hwQWCglpq2UyKgDOxdD3FBCIlqVZJ8en0N6qFzxplkm7vpnmq8Plae0Y2M yuZOYpNQGhpTWSVMRJCuGV5/nEAsOikgh8D2DS0huh3RLF7CW+5quTUzGunwm5CkCmylJc dgPxq3KYssIalR/dMvc5BixoiKYWnp3+QOU7USTuxKq8TLDiaajlaLbot3Ao9qnqjnl4Mk ow2DxV6QSb//+OuH7jdMerOVaz+uDH7w9RCr892hZmFNaQ77cJj53REIWRTlQw== 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 4T0tVW1BzCz14tT; Thu, 28 Dec 2023 02:58: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 3BS2wBoD024166; Thu, 28 Dec 2023 02:58:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS2wBpx024163; Thu, 28 Dec 2023 02:58:11 GMT (envelope-from git) Date: Thu, 28 Dec 2023 02:58:11 GMT Message-Id: <202312280258.3BS2wBpx024163@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: 4d3c234d8eb3 - main - sa: Check for errors from copyout() 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: 4d3c234d8eb32f903d630b371208a0a931d3d5fe Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4d3c234d8eb32f903d630b371208a0a931d3d5fe commit 4d3c234d8eb32f903d630b371208a0a931d3d5fe Author: Mark Johnston AuthorDate: 2023-12-27 21:28:28 +0000 Commit: Mark Johnston CommitDate: 2023-12-28 01:28:25 +0000 sa: Check for errors from copyout() This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: ken MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43203 --- sys/cam/scsi/scsi_sa.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c index aa4dc8e84c10..f84fc5bcb1ab 100644 --- a/sys/cam/scsi/scsi_sa.c +++ b/sys/cam/scsi/scsi_sa.c @@ -1494,8 +1494,12 @@ saparamsetlist(struct cam_periph *periph, struct mtsetlist *list, bailout: if (need_copy != 0) { if (error != EFAULT) { + int error1; + cam_periph_unlock(periph); - copyout(params, list->params, list->param_len); + error1 = copyout(params, list->params, list->param_len); + if (error == 0) + error = error1; cam_periph_lock(periph); } free(params, M_SCSISA);