From nobody Tue Dec 26 02:04:22 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 4SzdPM44xnz55KqC; Tue, 26 Dec 2023 02:04:23 +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 4SzdPM0XJnz4KMp; Tue, 26 Dec 2023 02:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556263; 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=IVXPTmtzAIOP+oZwd/DIlY0SpdSHNwWsdr00Tkyln4Y=; b=qcN5KA2qb5+ojQYOG6KNptlOOsxqElb3JDIl+eVfXyzRdMXLRZHXYNbIRm+7CBkH0nVDo3 ZvARU5GQwgEmVPkWh4JREZlBePYnqUbsf3FGa0PbbuGdB5WT/9bFY/cnZwYCeJSIPwm9g1 yGO3M3Bp8ZMFHdF4hsWZE/YRA/MAXqrnPWIIjRsEfuXJnoBjmd1BS5+WKUXuo9FoGsHHf4 NdwL3xavG3on5GCgc5E+yc6MhMgCA6z93capMK09zg3PpRePyuHqO31Z0ybKfHvAt+xbHT cmfJ33cy+pglxXByOMwAJcnEWLO9IUHqxQaP96r9HPWzGZH/VO5fFXTR2O3Q2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556263; a=rsa-sha256; cv=none; b=AQp3BA2pTKWaTy6zvFmv3kr6UDExmNk/LxpLryv9hGVomVmhS8z2F8KzevhB7vVZFlzUkv EPub6sBu4TwqsWpL2FOLS1Dnr9Thks6P+2jKhLGnVaMpx8BWfiHtEAjue9LHlHAl3D3qsF bJM9dTT2t5tdZU/38NQ4wqQAIV0OhAdaQvrc2VOnfAeE37/g+kEeadNCC1OoyRGeJxfeE4 H9/jKHOGKKg9A2O72dTTDQ2VXkwbRjGwQrLWuTckSxWxPudOn4gPKHKlRK1JlQqux4e21v CXhKYnTL0neB6vJX5yDzBcNF0eqqg0JuHcytz3YeYGu4m2XHgQyJ/BiubDKUbw== 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=1703556263; 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=IVXPTmtzAIOP+oZwd/DIlY0SpdSHNwWsdr00Tkyln4Y=; b=wnICECRfS8MGJclqou+7ZBlyuQ7aH81yiPERMSpKei9Ilrv/LPC1Pz/vaDWmXBLtVZHNic /VDAo6ff+9qG0CwHngP/dRwnZdfDoxuLXtpGOLFH4LtOGdQBZCAGdMmZUZapeyXcRUYz+c p3r4VaHKFqFIvHzZZ4AI3iZIusdf1vFZQqteChtV4c918iqoq784T+UgcQVww8w/eLv/Uc 9jaGDMgM9++NUfhau/fvoR0GFkeKUAnLbLpePkaSscsIwbQj4hTsoG3SVqD3fX434AQoFR ldV/+izGh4eRII7oEDsCbiRawtosx2rc6nyzFQCAOM+tL/rbk3F8sdBSfyhpxg== 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 4SzdPL6X35zblC; Tue, 26 Dec 2023 02:04: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 3BQ24MP2003146; Tue, 26 Dec 2023 02:04:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24MDe003143; Tue, 26 Dec 2023 02:04:22 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:22 GMT Message-Id: <202312260204.3BQ24MDe003143@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: 771501e96ffd - main - ses: Add error checking for copyout() calls 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 771501e96ffd7e314c338300a351ad76d28a2f69 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=771501e96ffd7e314c338300a351ad76d28a2f69 commit 771501e96ffd7e314c338300a351ad76d28a2f69 Author: Mark Johnston AuthorDate: 2023-12-26 01:40:33 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:00 +0000 ses: Add error checking for copyout() calls This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: mav, imp, asomers Tested by: asomers MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43130 --- sys/cam/scsi/scsi_enc_ses.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c index 0a3136aa8d10..c429e820a1fd 100644 --- a/sys/cam/scsi/scsi_enc_ses.c +++ b/sys/cam/scsi/scsi_enc_ses.c @@ -2810,8 +2810,8 @@ ses_get_elm_desc(enc_softc_t *enc, encioc_elm_desc_t *elmd) } if (elmd->elm_desc_len > elmpriv->descr_len) elmd->elm_desc_len = elmpriv->descr_len; - copyout(elmpriv->descr, elmd->elm_desc_str, elmd->elm_desc_len); - return (0); + return (copyout(elmpriv->descr, elmd->elm_desc_str, + elmd->elm_desc_len)); } /** @@ -2827,7 +2827,7 @@ static int ses_get_elm_devnames(enc_softc_t *enc, encioc_elm_devnames_t *elmdn) { struct sbuf sb; - int len; + int error, len; len = elmdn->elm_names_size; if (len < 0) @@ -2839,10 +2839,13 @@ ses_get_elm_devnames(enc_softc_t *enc, encioc_elm_devnames_t *elmdn) ses_elmdevname_callback, &sb); sbuf_finish(&sb); elmdn->elm_names_len = sbuf_len(&sb); - copyout(sbuf_data(&sb), elmdn->elm_devnames, elmdn->elm_names_len + 1); + error = copyout(sbuf_data(&sb), elmdn->elm_devnames, + elmdn->elm_names_len + 1); sbuf_delete(&sb); cam_periph_lock(enc->periph); - return (elmdn->elm_names_len > 0 ? 0 : ENODEV); + if (error == 0 && elmdn->elm_names_len == 0) + error = ENODEV; + return (error); } /** @@ -2921,9 +2924,9 @@ ses_handle_string(enc_softc_t *enc, encioc_string_t *sstr, unsigned long ioc) size = rsize; if (size > sstr->bufsiz) size = sstr->bufsiz; - copyout(str, sstr->buf, size); + ret = copyout(str, sstr->buf, size); sstr->bufsiz = rsize; - return (size == rsize ? 0 : ENOMEM); + return (ret != 0 ? ret : (size == rsize ? 0 : ENOMEM)); case ENCIOC_GETENCID: if (ses_cache->ses_nsubencs < 1) return (ENODEV); @@ -2935,9 +2938,9 @@ ses_handle_string(enc_softc_t *enc, encioc_string_t *sstr, unsigned long ioc) size = rsize; if (size > sstr->bufsiz) size = sstr->bufsiz; - copyout(str, sstr->buf, size); + ret = copyout(str, sstr->buf, size); sstr->bufsiz = rsize; - return (size == rsize ? 0 : ENOMEM); + return (ret != 0 ? ret : (size == rsize ? 0 : ENOMEM)); default: return (EINVAL); }