From nobody Wed Apr 03 02:01:32 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 4V8SfN4654z5GDH8; Wed, 3 Apr 2024 02:01:32 +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 4V8SfN3BmRz4L6R; Wed, 3 Apr 2024 02:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712109692; 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=K24V47JVRLuyhwDWkFce4JHkVsrWvEqi4h8L1II6sr0=; b=a5jI3Y/8vWRDCUP7CqEKVDRijnJwW+HZolGkc9jb8It1PBM9fHROKQHgOHb1bfhXpzPflJ Qw2f/0/dGWa4s2iJp04uxfDgZRuC0Gtcu/5KnD5m+4KJTlkz1RZ3wLS3zzjpVwF7D7StGH UtN7ixKgnWCHq4Y3mOEuaYnjqGh2nMFVT4yHk8KgqBQ+ylS9JgF1wanGubWgHPvfFkffea hnaTtdCtyTjd5XrMKqQ8j63fFLs8X5LSOPr5LzcDxkjfiEbVR/Ag+dkk693LXfxOtFxOsU TgBDMSsCU8gq8IwYhlolStZoxmAGpRMhII9VGHPtONx6QdFcmKUC5t45feyIEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712109692; a=rsa-sha256; cv=none; b=p1Q6b6vsTWPSQVQ3Tqf+bISIvXEsWvsDYy7CHLKUZiFXZU4TNsXja840yAaX8aWv3h2Ot4 rPOrJDSJjcS3c9fQIwI4FwqBoL4bXvvFmPeZszy+aGUWydCDK5u0TAWUEgHcm0jA48LGa+ BDGYw9bjuDhYJ+OPrJATFf7FWxRjuqzci56E7H0nFUU9S83vxaO0v9Lw8S4d7GuIsYEWbn 8/Sm4VRXdS2mpimkSDWWYnm+ur5+B/42XRa+hpdLiW87lEGGPTgIMB24fLO1wU5X4/LgvD LPLtISixnp2x4CDyiL6fjnvaznMsYWnV54Q1GVTRSG3mIokDPcRWJh31byjMcw== 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=1712109692; 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=K24V47JVRLuyhwDWkFce4JHkVsrWvEqi4h8L1II6sr0=; b=c7ekuElCCtUldqPLW05Xq+2mV7KV78y9ilQFHcTP1626fJgwqPN/K0j1zUNksRQXg5A7Pz 9M3x8/fs/9e+xBeavd4yvPGMhi04okbHvO5hw+Ot0dUyij1ryEqy/z/xYGylOFcHWdSFlw m+/XcnFzV+DwcY86cPil8sCV2B+iGm1Nrdfc5s+V9+/4LvTfW0yKnxbyecI7fRQyzxzpq7 xZkiLeej6WRtYGkwz+BV3+kuBQSLPv/DVNylsFuN86bGnVx9EnDLvt/BaL99YA8wOL5ZVs A7Hcplzhs0rTF+dH6CgOkI510Creex+C4XPi9qMC0M9b2ZMwUCLAdJ5io1dMEw== 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 4V8SfN2pXXzDr6; Wed, 3 Apr 2024 02:01:32 +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 43321WTg050691; Wed, 3 Apr 2024 02:01:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43321W9v050688; Wed, 3 Apr 2024 02:01:32 GMT (envelope-from git) Date: Wed, 3 Apr 2024 02:01:32 GMT Message-Id: <202404030201.43321W9v050688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lawrence Stewart Subject: git: 7eb92c502eb5 - main - 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: 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: lstewart X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7eb92c502eb503d808a51296e426de625239a0d9 Auto-Submitted: auto-generated The branch main has been updated by lstewart: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb92c502eb503d808a51296e426de625239a0d9 commit 7eb92c502eb503d808a51296e426de625239a0d9 Author: Lawrence Stewart AuthorDate: 2024-04-02 06:34:25 +0000 Commit: Lawrence Stewart CommitDate: 2024-04-03 01:58:26 +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()") --- 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 0f1b83a5783a..9fb8f8cbd74b 100644 --- a/sys/kern/subr_stats.c +++ b/sys/kern/subr_stats.c @@ -1078,9 +1078,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) || @@ -1131,14 +1131,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: