From nobody Thu Jan 11 14:32:35 2024 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 4T9nFJ0jfSz567Sh; Thu, 11 Jan 2024 14:32:36 +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 4T9nFH6HBqz4SxF; Thu, 11 Jan 2024 14:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983555; 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=njFua8jI9uL8XQwTazZrzlkxTWhXDduQIqzk+icaWjc=; b=wrR1JWZtTIH76NlVaf47OZc+iHES4t6xkJ/942sabJB4+CgBWu2sIr89neQRSmDfa8Ed/V KZqp4iVWNfsy2tx3wJoTklRsZlbr7LQVoXE1sifckz76e5ahphj7GWpstxLYkU84lalNmP yBrO2BP6xWCl8v8Cmrs0LPFIBhQGv8l0Gbd9X9CcBAXb7LUuNQZE4UhK5BnIgXnezAgUCg rdt38zLNsL46I5oZkyVpEiROka77cBtm99WrG5cY1z9UTLGUKNvRSo9ficYHgq2c6VDzvM qs3gWuED4GvT5bK0KgLKQc9/Ckeo5HA6o1p2cyJZUokLMRc/j3O112OlnUSBnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983555; 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=njFua8jI9uL8XQwTazZrzlkxTWhXDduQIqzk+icaWjc=; b=AIjEnYoTnlfwEYPELq2TCS9+yHVMqHM4hh3tuAk3vzrpmEXy/AP4VWhjxknNszS6v1WpL7 ZVup11bVi9I/zXDpNcYaz0tQTwAqd43VL2xug4y7R9RaQ4R2FNC+nloQzKgoVArs5IoPGL DTTaK8ZcRd7rT4jHAdn8SMe5SMfoD7vd/zD5Q21cW14VKi/rMxgQHtZUX+7eCuvNIDvYWF epwKdb1rk7m2dwT7j83vO/ZfDlczFX0oBmFnBh5SBG2g1lNNGGj33RzhMseW1ZMyUYNY+a oQmDoc5+pnoH8ncuiwc4axZ4NvKIowmnTd6e62ygvGwxLtuibucWjVmAXcN5Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704983555; a=rsa-sha256; cv=none; b=kniCVrqX87qKMrom1WjDTesFQ+FtEqI4p9FrFLixD+eeI8+rmWrYZKvR3Kk4k9G5Rc5PCy h+8Y+5vApgEwvNho3g+CALT5IQSxt0HhGsazSIoqFlDTO65J9lJjQEo7NO+PW8/2iIjZuO XpUBI4tsJB0wSrcsFUo/8Jl9ch1VqLIYEJqO8OvcdZNfwzJHJr2N3DEmdsSycJMflFHbhJ cKcsod063YyancGPkg/Cf2gPgXhrmTkRgloIDAu1UOlODZ6RWCHVCx6371XJHvESbQaV7q rljggiLq6opvs/IKLj+sJvzzn38qJVtFTvUjCZ7xWvJXjLdHpsoDa02SyDjaLw== 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 4T9nFH5NGdzMvj; Thu, 11 Jan 2024 14:32:35 +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 40BEWZkk024220; Thu, 11 Jan 2024 14:32:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BEWZ6Y024217; Thu, 11 Jan 2024 14:32:35 GMT (envelope-from git) Date: Thu, 11 Jan 2024 14:32:35 GMT Message-Id: <202401111432.40BEWZ6Y024217@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: b8233245b8d0 - stable/14 - stats: Check for errors from copyout() 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/stable/14 X-Git-Reftype: branch X-Git-Commit: b8233245b8d04816d13ea0c4441c0ded57323840 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b8233245b8d04816d13ea0c4441c0ded57323840 commit b8233245b8d04816d13ea0c4441c0ded57323840 Author: Mark Johnston AuthorDate: 2024-01-04 13:33:58 +0000 Commit: Mark Johnston CommitDate: 2024-01-11 14:19:19 +0000 stats: Check for errors from copyout() This is in preparation for annotating copyin() and related functions with __result_use_check. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43179 (cherry picked from commit a0993376ec5f979272a62b140ec9f41bc02107b3) --- sys/kern/subr_stats.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_stats.c b/sys/kern/subr_stats.c index 0e7d2fad5f68..6a9dff2b9126 100644 --- a/sys/kern/subr_stats.c +++ b/sys/kern/subr_stats.c @@ -1108,13 +1108,19 @@ stats_v1_blob_clone(struct statsblobv1 **dst, size_t dstmaxsz, */ #ifdef _KERNEL if (flags & SB_CLONE_USRDSTNOFAULT) - copyout_nofault(src, *dst, + error = copyout_nofault(src, *dst, offsetof(struct statsblob, maxsz)); else if (flags & SB_CLONE_USRDST) - copyout(src, *dst, offsetof(struct statsblob, maxsz)); + error = copyout(src, *dst, + offsetof(struct statsblob, maxsz)); else #endif memcpy(*dst, src, offsetof(struct statsblob, maxsz)); +#ifdef _KERNEL + if (error != 0) + goto out; +#endif + if (dstmaxsz >= src->cursz) { postcurszlen = src->cursz - @@ -1126,14 +1132,18 @@ stats_v1_blob_clone(struct statsblobv1 **dst, size_t dstmaxsz, } #ifdef _KERNEL if (flags & SB_CLONE_USRDSTNOFAULT) - copyout_nofault(&(src->cursz), &((*dst)->cursz), + error = copyout_nofault(&(src->cursz), &((*dst)->cursz), postcurszlen); else if (flags & SB_CLONE_USRDST) - copyout(&(src->cursz), &((*dst)->cursz), postcurszlen); + error = copyout(&(src->cursz), &((*dst)->cursz), + postcurszlen); else #endif memcpy(&((*dst)->cursz), &(src->cursz), postcurszlen); } +#ifdef _KERNEL +out: +#endif return (error); }