From nobody Mon Apr 7 01:29:15 2025 X-Original-To: dev-commits-src-branches@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 4ZWBSr3BxLz5sNVY; Mon, 07 Apr 2025 01:29:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWBSq6pFrz3wbd; Mon, 07 Apr 2025 01:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989356; 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=ZD0AjNhzh4h6ahRrwRQ5CYtz3DLPjXhJJLJeOQ1FSzQ=; b=qNT8uT5lwJw4dj1+q33G9Ijz2gxAwyAXUIZekQ9NtI3a2iZZUQ+X7DUUSOSkdlwZx8ghEc j4W4WshVi87/tH4AupOzuQJpO19qiDY6YtD2gQHz4rWfL5W8ty7tLJvgenzUbbUE+5Kmcc h21nzLrVZMIbp390MyhuhsNbqDkaizRkeY5UgcC/1XTvHURnVyZCJBJb//fRhSNzchXe7o Pzgc1GBRwO6FPMDsmGxnwO9tauWAEwgfmOebMZ4J/oVjYkQSCxuARjApEezE1SqCLtBJkB TdK1cD1SKpjB+R9PzWJSeUDtOhS44A9dozQmlVCmKv+ZX/m+J8SdFUsgeoI1VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743989356; a=rsa-sha256; cv=none; b=aEpre/BxoOMktm+Z29c4BxIwvbc/+fRJH0nxxYsKgoeVkZl84sWAoMdoVk821AKuueL85L eGGNLIISBoi+Sug/aV1+2cIuDc/6QnkYLEPa+Fc9LQiJu/1z1dfa8ozJNX3hsJq7rM90wd Q8QfLx+mNK1yLRAhkkatEl39oNpFu/wxJ/G9d5/ClELLZZkZEI8CvLVvwia/GeoD5z1Oe5 VHn/cXUKpeIchlNgxcG2EKsCXy9sMPeUa9LU7UJmAyOiYz+lc1a/922l3xF6c9D4RiFnn5 2yEuUIQ6ZaYNuXu2WEJYy6vvGFTsjlp3Q9PeFF0vl4C3iWvm3Is+UwDIEhUbpw== 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=1743989356; 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=ZD0AjNhzh4h6ahRrwRQ5CYtz3DLPjXhJJLJeOQ1FSzQ=; b=uCmoQ//wc97LnZZZ7ck5PLFG3BboincAsfH1zjPjUD137Hw2pqc4nLT/IIL+jBCPYi1f/D d6CUqDsdw0taTB8xz4AU6NrKmKMzUHtFRZ8Jj/N1Q9KUGcD0AQnC+wr3asR6Ax82MYv6km 6l4ee2vXiBU/9/9ORsXCH3K7Wa67GhdKmJ05Jsgd98XCYZ6hg4GTBV4xxR5LIaJwGLqcYG SUh45EXJ89S4raokJ2PUw8N/FznwUkGI2QCC+TiDIo+WS1v0HcKhal4MTwGt9LUwOPDBL6 wN7KIAQ8cndYEo6lrJwvyjQ0S9p764/MkxbJEPsj5mTAeLyFXMep+RUxZIKxXA== 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 4ZWBSq6Ksyz9ft; Mon, 07 Apr 2025 01:29:15 +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 5371TFIc063396; Mon, 7 Apr 2025 01:29:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5371TFRA063393; Mon, 7 Apr 2025 01:29:15 GMT (envelope-from git) Date: Mon, 7 Apr 2025 01:29:15 GMT Message-Id: <202504070129.5371TFRA063393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 40c6cb628a12 - stable/14 - kern_proc_kqueues_out(): maxlen == -1 means there is no maxlen List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 40c6cb628a122b32986bdadb8ddf70f1a4455c92 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=40c6cb628a122b32986bdadb8ddf70f1a4455c92 commit 40c6cb628a122b32986bdadb8ddf70f1a4455c92 Author: Konstantin Belousov AuthorDate: 2025-03-24 04:29:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-07 01:28:22 +0000 kern_proc_kqueues_out(): maxlen == -1 means there is no maxlen (cherry picked from commit c18a16ebcf5bf0bad19be10f58d9f42cbc079057) --- sys/kern/kern_event.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index e891cb7c094a..eb77a5064113 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2974,13 +2974,21 @@ kern_proc_kqueues_out(struct proc *p, struct sbuf *sb, size_t maxlen, bool compat32) { struct sbuf *s, sm; + size_t sb_len; int error; - s = sbuf_new(&sm, NULL, maxlen, SBUF_FIXEDLEN); + if (maxlen == -1 || maxlen == 0) + sb_len = 128; + else + sb_len = maxlen; + s = sbuf_new(&sm, NULL, sb_len, maxlen == -1 ? SBUF_AUTOEXTEND : + SBUF_FIXEDLEN); error = kern_proc_kqueues_out1(curthread, p, s, compat32); sbuf_finish(s); - if (error == 0) - sbuf_bcat(sb, sbuf_data(s), MIN(sbuf_len(s), maxlen)); + if (error == 0) { + sbuf_bcat(sb, sbuf_data(s), MIN(sbuf_len(s), maxlen == -1 ? + SIZE_T_MAX : maxlen)); + } sbuf_delete(s); return (error); }