From nobody Fri Feb 14 19:25:36 2025 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 4Yvhpn51xXz5nXP0; Fri, 14 Feb 2025 19:25:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpn0gtlz48wd; Fri, 14 Feb 2025 19:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561137; 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=7GGZaRuAqqsTU8P2Mqt5BBK69ixPn6VfbAAQ7fRfWDw=; b=S59tEVDijEjqkT7y+4xqd8FlvfFXa4oeQOaBBzIYeARxk8Vebr+QWy6k+SY4KVsTA/uk7o /E8w6QOKdQ9E/OjKx0qcAip7XNS4Pqkszxp2+XTxW8wV4J4088cKUqbqw5YUv28YjONOX5 PVLBL0r2b4B7+nZC26Hi+TNFs8V74QYyvv11M9WS08HZ9addP9Agp0jYxNmBzxcsbS2bQd gLob6F+/qlusR4y0nonZVTAFOdGQFwbUBXSwS/kH0Uv3smT2UXOyobwTo0VhdFRVl6DTFR zlWv1spLMjlCvi/A916rrhfTIFCzl6zjzXuOeoLMN5VDd4g26fU6btB1JqfqUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561137; 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=7GGZaRuAqqsTU8P2Mqt5BBK69ixPn6VfbAAQ7fRfWDw=; b=sRPFLKXr+L2A+leC7ASozd4kQi1etcKqqPMOciS7I62/7sMW3lZa4vy0xmTIc2QtAS8X3M 0H3w2yRpDWxcRUqsv9gqG+HOGd4kz4MYAuKBCQD9EZFFBZ9skMzs5epJ56h7wCXIznpFDg JJXDYLijdObSNbrkRH6Typf2l+blsVQbKjarK0tqhSbfxqxdXKVV/zJ7Mfjz4iFJ0DmWDG QHus6eiweGZmqLtWf8FlSYKYnJbh6gtlTyt81qRNff+P9cZB47Z/0k2kakaNqq/V0SXRIB JU18cexnorQiDOk7SujHq9fDr4sCFQdi8/ieydb3Fvwc+B5DRaP2qLYzc1nUew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561137; a=rsa-sha256; cv=none; b=xy+v4x0mzZLW7Fe80RBnPiLBEPEKAWQORUQFLz6HlXTCafay6rbiw8KC3+LmeGi5HlNjcl FtGepvNO5pKRvMGU0UQXEXVTbRLhl1f00YbEcqW7NRfoquTP+39C4IN7li356tfjWq6A36 9pB8JnVniTMSQ68v39gvGYYo5mhOn8vRS4wrwetweHDueosmSU/sQtFbEZ14nqaD7MJOWo fDZ8ubyG3V7o20vsjCa6TNJcB8xE+hDd3aM5D2vkMUhrya4EaCE8UI8D9OqSw9RFUSDGnQ BcRkewOLtlcUWcVvTGhuDSlgrYQDmPrjNzavo4NMxtYA0jMalAg2DO4PDJcfqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yvhpm6wCMzkGM; Fri, 14 Feb 2025 19:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPaZl039068; Fri, 14 Feb 2025 19:25:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPa0w039065; Fri, 14 Feb 2025 19:25:36 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:36 GMT Message-Id: <202502141925.51EJPa0w039065@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: 31af1ba0a87c - stable/14 - Reinstate returning EOVERFLOW from stats_v1_blob_clone() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 31af1ba0a87cbf2fcc9850e012e5a62f750211b1 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=31af1ba0a87cbf2fcc9850e012e5a62f750211b1 commit 31af1ba0a87cbf2fcc9850e012e5a62f750211b1 Author: Lawrence Stewart AuthorDate: 2024-04-02 06:34:25 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:19 +0000 Reinstate returning EOVERFLOW from stats_v1_blob_clone() a0993376ec5f (from D43179) subtly changed stats_v1_blob_clone() to stop returning EOVERFLOW in the case where the user buffer is not large enough to receive the entire statsblob. This results in any consumers which are implemented to retry on receiving EOVERFLOW to instead give up after receiving an empty statsblob header. Fix by latching any errors recorded prior to copyout. Reviewed by: markj Obtained from: Netflix, Inc. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44585 Fixes: a0993376ec5f ("stats: Check for errors from copyout()") (cherry picked from commit 7eb92c502eb503d808a51296e426de625239a0d9) --- sys/kern/subr_stats.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_stats.c b/sys/kern/subr_stats.c index 6d04b9ae1588..23908c59c996 100644 --- a/sys/kern/subr_stats.c +++ b/sys/kern/subr_stats.c @@ -1079,9 +1079,9 @@ int stats_v1_blob_clone(struct statsblobv1 **dst, size_t dstmaxsz, struct statsblobv1 *src, uint32_t flags) { - int error; + int error, tmperror; - error = 0; + error = tmperror = 0; if (src == NULL || dst == NULL || src->cursz < sizeof(struct statsblob) || @@ -1132,14 +1132,16 @@ stats_v1_blob_clone(struct statsblobv1 **dst, size_t dstmaxsz, } #ifdef _KERNEL if (flags & SB_CLONE_USRDSTNOFAULT) - error = copyout_nofault(&(src->cursz), &((*dst)->cursz), + tmperror = copyout_nofault(&(src->cursz), &((*dst)->cursz), postcurszlen); else if (flags & SB_CLONE_USRDST) - error = copyout(&(src->cursz), &((*dst)->cursz), + tmperror = copyout(&(src->cursz), &((*dst)->cursz), postcurszlen); else #endif memcpy(&((*dst)->cursz), &(src->cursz), postcurszlen); + + error = error ? error : tmperror; } #ifdef _KERNEL out: