From nobody Tue Mar 17 16:10:15 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 4fZxkb6T15z6VDq4 for ; Tue, 17 Mar 2026 16:10:15 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZxkb3Dmrz3YZg for ; Tue, 17 Mar 2026 16:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773763815; 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=Bs0B6HizXGIJ0J+TU5p9Ie1jLpzoo/1jGEC6MzdQZsc=; b=gdNQ/JweX2pTwJbgI9b+rH2dKS6qdtiErF/Qzs0LBbxMT8BMD2mv12Fy4XGPfmJDCWj/tm wJDN9F0DK1PWPg++woSrQkRDnRF9Z5fSvFG+AkGoFc+gudvuxkBQwlNjxaXgwKl8fVNt/X fWEVnJDWy9jGjDlrQ3NTzXT8vjIW0UlSIinZ7fDSzcc6Uc6OygdLcNqDBMwID3JohkKjdn TFr55YYaR2Z/iWA/JQSP0EO3XQzTrzzY9jCDFcSWbZ1y5RCjY0ePoDnKUB9DUN7GVU1oiB 3etHlknqL/X0sZ4i+1ulseS2LMSPBrJOa8z1p1DaLoLQTP58eRpFWBwohupnVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773763815; a=rsa-sha256; cv=none; b=Ha7CC4o5RXhLY7wEy+vnTl3CQ0LHII288MDFOPS0gjg7+3LZU2oneR2DWDFpPuO1HNrLSY 4ylPNIXtyajDRtBhP2Uy9ftX5NWbnsnWbL0dYj/gnB/ygzkgRVV+uBM5t4jjYVGwKqUUFB MefsBYzOnyy3Fd850gusq++Yfhc1CECZqLI6oB3PEHOtto9Ov2wspMp969HIWasXPVHH60 hVamlasz7rS5+mCOUhusGcUP2bkPLXk9Yn7NkfUwJ8Qcln3673t/GbTyjrBs51yz1Svhre HHwDjsutWgo9Plr4u8FbFXeUcY9LCYArAtuTMJ6oBV3Y5OQy0OQX7YWQ0OzYlQ== 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=1773763815; 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=Bs0B6HizXGIJ0J+TU5p9Ie1jLpzoo/1jGEC6MzdQZsc=; b=NWGxLUCTjOAH2h8xZ2SkCtIQi07H9Cc8jwcJ+tRg09JlmZF3uM0izdbF6wavCAI9jQJgPm aWzE96HoZGb99KYu2c/iQmLJq/LaFGHii7trA5CQjnGhrCvg5mNP1erZSkAJrveYbOtANY bfQt++QPHfoVOS5fBLbsQZ24zujwGogxHqlQGcV1kDdcike8UNCKmYIYXiUGXqXk3sK0+X /R87NSZpdUpCTcLskWqm9saLdYqr3DcXbeDzZjk+hKXOON1E5UExByjxrDxEOTMLH5ILnh CS6HK9R9fdWE5ZGUlDKWkmymAUleHSZBspVigJzb5Z7D6PwrUUCjLu2IBREeFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZxkb2cZvzCmt for ; Tue, 17 Mar 2026 16:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c81e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Mar 2026 16:10:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 58d74d7b0ca9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 58d74d7b0ca9bdf3aacfbe014bd00387f87b9be0 Auto-Submitted: auto-generated Date: Tue, 17 Mar 2026 16:10:15 +0000 Message-Id: <69b97ce7.1c81e.57c838e0@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=58d74d7b0ca9bdf3aacfbe014bd00387f87b9be0 commit 58d74d7b0ca9bdf3aacfbe014bd00387f87b9be0 Author: John Baldwin AuthorDate: 2026-03-17 16:05:30 +0000 Commit: John Baldwin CommitDate: 2026-03-17 16:05:30 +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 --- 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);