From nobody Fri Apr 24 17:56:25 2026 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 4g2LHZ0rv2z6ZxV5 for ; Fri, 24 Apr 2026 17:56:26 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2LHY4B2rz3qbH for ; Fri, 24 Apr 2026 17:56:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053385; 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=wix1ZAmHUtia3aE4a0Gwsw6THuwBTP7eaMdQA3zzMLA=; b=BJziIh9+nr0580x3RwXrzQxjDesoQXG6wE92IOHvgS3rymJIWj84mgAQ2btkUNgvyp/Y5z OHjxt5hyjlshapKBbuiBtapaKQT61vfNCQcsHpE/z+yNndGEz//bjAQA7XMY94IS/JfR+x suxCWlpjKv/ZZq8eBqQHPb+0L11CYP1QXJT3TUcWR4wdTh3E3WZlJdFhbno8EJGwbbun2w iWXSWVKEzRXt1sTzUwPmv3olhMHzCxCo1P4rxBTtTxjJyWpEeaaBq4jk+v+qzIbZIc/qLb QgPiCTMzd+2pXn1z6cwnil0/39jE6jFCPLnY5oKjxp78Rod29UvgXwlyz5dqIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777053385; a=rsa-sha256; cv=none; b=SMzZI37+rRNrlyj04KusGngOTPWVCmp4c1D7arALzKMw1K/3T6QxQoiYRDoisr4aOXHREB /XFq4SSLk2P1N+1MahIXHpFDdnlw1geuBFJf7T+qWnHF7dNOXxaR482Ek8BjIRogFQsPEg gM8dAX0iSTQdsk1kvsmur/t98JgpM4ORutf9tIV20TDZ1W2tMuoPi3OyHZXs7ld9wjQNUm EWWR5/vnhpiJNzAxf4ziOg0y3ujR0DmoZ/cJ34/E/EswIwH5GxVs/2EpF7xYwKU9eYwqXk CP9LJa0O/FQHYdFV0oxE32m+MsOe2KebZZGhYXB0r0lw2mf550GjiPge6i2T5w== 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=1777053385; 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=wix1ZAmHUtia3aE4a0Gwsw6THuwBTP7eaMdQA3zzMLA=; b=L/QFTYgW0Wuu3YvexZk3HPbCX9bcVX/PR9RQcMU3AoWLRjQyUBSLig1uGxrW+hPswO4xBO nDKzGDOZVKNw6u06DAtBy73KJxBqnxwfyDGzYHk51LtMYNT4RQR8XVfqsgoMxihQOZooI8 eqTjIeUvjzGNJ4iebjBpSP9iMhzJPak8xDUiVYqs1hFVJx1kPPfxQShYXEcOHAyMhltkbB 6MMoHysEoztgQT7K0pir/ECNrmIwQBZXhfIZt4Bi93uTY9JGheh/lEjfHDXA/m2AfO4CrD hRGGohkLEv3V0/cOmx/J9z9lrQWVyF6wRh3ad5AHvLKlUSPDbIAHCxvGkY2k3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2LHY3SdMz1Cb6 for ; Fri, 24 Apr 2026 17:56:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d5c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 17:56:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 072744dbd55b - stable/15 - LinuxKPI: Use simple_read_from_buffer in simple_attr_read and seq_read 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 072744dbd55b78ef22e30abe661ffc8ddd074ff8 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 17:56:25 +0000 Message-Id: <69ebaec9.1d5c4.66bcb608@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=072744dbd55b78ef22e30abe661ffc8ddd074ff8 commit 072744dbd55b78ef22e30abe661ffc8ddd074ff8 Author: John Baldwin AuthorDate: 2026-03-17 16:05:30 +0000 Commit: John Baldwin CommitDate: 2026-04-24 17:49:14 +0000 LinuxKPI: Use simple_read_from_buffer in simple_attr_read and seq_read Reviewed by: bz Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D55879 (cherry picked from commit 58d74d7b0ca9bdf3aacfbe014bd00387f87b9be0) --- sys/compat/linuxkpi/common/src/linux_seq_file.c | 11 ++--------- sys/compat/linuxkpi/common/src/linux_simple_attr.c | 13 ++----------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_seq_file.c b/sys/compat/linuxkpi/common/src/linux_seq_file.c index 6fe6ccd1e68e..b1d53aa2db60 100644 --- a/sys/compat/linuxkpi/common/src/linux_seq_file.c +++ b/sys/compat/linuxkpi/common/src/linux_seq_file.c @@ -60,15 +60,8 @@ seq_read(struct linux_file *f, char *ubuf, size_t size, off_t *ppos) if (rc) return (rc); - rc = sbuf_len(sbuf); - if (*ppos >= rc || size < 1) - return (-EINVAL); - - size = min(rc - *ppos, size); - memcpy(ubuf, sbuf_data(sbuf) + *ppos, size); - *ppos += size; - - return (size); + return (simple_read_from_buffer(ubuf, size, ppos, sbuf_data(sbuf), + sbuf_len(sbuf))); } int diff --git a/sys/compat/linuxkpi/common/src/linux_simple_attr.c b/sys/compat/linuxkpi/common/src/linux_simple_attr.c index 8cc9ec7ecbc9..88fa908e47bb 100644 --- a/sys/compat/linuxkpi/common/src/linux_simple_attr.c +++ b/sys/compat/linuxkpi/common/src/linux_simple_attr.c @@ -119,18 +119,9 @@ simple_attr_read(struct file *filp, char *buf, size_t read_size, loff_t *ppos) scnprintf(prebuf, sizeof(prebuf), sattr->fmt, data); - ret = strlen(prebuf) + 1; - if (*ppos >= ret || read_size < 1) { - ret = -EINVAL; - goto unlock; - } - - read_size = min(ret - *ppos, read_size); - ret = strscpy(buf, prebuf + *ppos, read_size); - /* add 1 for null terminator */ - if (ret > 0) - ret += 1; + ret = simple_read_from_buffer(buf, read_size, ppos, prebuf, + strlen(prebuf) + 1); unlock: mutex_unlock(&sattr->mutex);