From nobody Wed Apr 22 21:08:26 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 4g1Bf34qFJz6bKsG for ; Wed, 22 Apr 2026 21:08:27 +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 4g1Bf25y0Sz3kw8 for ; Wed, 22 Apr 2026 21:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=03MCXjOwKTmKuusO6Rj9K7QzrVwPmHtlPhs4i5C201Q=; b=Wv3/qJ9jxnnXiuVY4sowPxMtUnkzQAaLJ2A/7cc8TEHiqOLU6XSeTj00KaJd62BgbM0V+k +gYhp2YHJTpDASl0ConrDAf8k30bHDCHxV64mljyZHrlNHiis9YIWBNjKljS4cEAvT9VO7 H3Sm66T1Vew1Uoppb7fylid2XxgJd8IGKTzCymq/zCteeKqz3jnYt4b1g6oHH5hV/OM3mA RJjGX39L4Q3NEj/B297iU55aauiiyuar6gUfLn4bamxLCrRmgyWgZWNUUi0TYPrEHxz9cr vLN7JZZDNMKK5md8aeqs3WDu6w49Ym0IFwFkk3xymPsyeXQhhh4IaPBsPZEjdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776892106; a=rsa-sha256; cv=none; b=RKsvMLF6pA/Dq9gFxmfauoNJ/935/zAEPsGE8y3e6tLI+82HfoU7qZLzpfK4OaWwXDYV65 qJmz+9+k1g/LtqaWyDSz8/WUT0oWmxKaAfKAkPy8o+H/bd/5CNNvfSHMeBGagsHFqtKhnc CHb6N0+d0AapvkSZCAt8GhNB/xwRQUtme90u8oHGKXa1Tz2PHQ9pm5XjFsGjlNqWFdgNZL Aor45YPO50+oALJLqwPb22PHMF8Dt0V+/Wq1TdTmd0wSp6e2sDXQpv6nzMyXBZP5/JEH5c O6FcAkMOYYTKvLVSkmMR1YX8xx4NewBOhk1/aGFSrHG+3vTRo/XX6fNW0rv2Wg== 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=1776892106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=03MCXjOwKTmKuusO6Rj9K7QzrVwPmHtlPhs4i5C201Q=; b=whc68uVazqndXT7XOy0AYgxAQ2J0hcU1043Np8oIwAIxnQ/1gw+weaTZRJIJdvTHHihmuO ne3NNji9N3jmAD6WhLnaldEPyEi5ubYmfygCAQCqB5blT6OiGq6x5T0uUVxtRzz8M+xTg6 GSlbc03uLmAxZmTlQgTbtXhcZKrAvHMq2rgljTbi76QVow4yDD1IpPbpTibcGC3vWcas0G QA/Me++TYXPNm+c9jcRPD+l/mpDNavN6AcZcfK0x4+rKBCT2g4oWnr2JoSsHbNXZBpfdjj 4trD4fO5E4r89jXVH0PRGTzqZYyjW6iJr4x+DtKNIUZtKh0ZFP/nB6c03wkldw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1Bf25VNhzn9f for ; Wed, 22 Apr 2026 21:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 275f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 21:08:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron From: Bjoern A. Zeeb Subject: git: 1c51a0177ddd - stable/15 - linuxkpi: Add `strtomem()` and `strtomem_pad()` 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1c51a0177ddd8d45fe0a68c73c31f67713164af0 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 21:08:26 +0000 Message-Id: <69e938ca.275f2.14ff0ea@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1c51a0177ddd8d45fe0a68c73c31f67713164af0 commit 1c51a0177ddd8d45fe0a68c73c31f67713164af0 Author: Jean-Sébastien Pédron AuthorDate: 2026-03-02 23:04:09 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-22 20:56:59 +0000 linuxkpi: Add `strtomem()` and `strtomem_pad()` The DRM generic code started to use `strtomem_pad()` in Linux 6.11. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55729 (cherry picked from commit 362136ed4987230269740f54531f6a945f00d135) --- sys/compat/linuxkpi/common/include/linux/string.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h index f7b64560d254..0b858e7af623 100644 --- a/sys/compat/linuxkpi/common/include/linux/string.h +++ b/sys/compat/linuxkpi/common/include/linux/string.h @@ -303,6 +303,22 @@ memcpy_and_pad(void *dst, size_t dstlen, const void *src, size_t len, int ch) } } +#define strtomem(dst, src) do { \ + size_t dstlen = ARRAY_SIZE(dst); \ + size_t srclen = __builtin_object_size(src, 1); \ + srclen = MIN(srclen, dstlen); \ + srclen = strnlen(src, srclen); \ + memcpy(dst, src, srclen); \ +} while (0) + +#define strtomem_pad(dst, src, pad) do { \ + size_t dstlen = ARRAY_SIZE(dst); \ + size_t srclen = __builtin_object_size(src, 1); \ + srclen = MIN(srclen, dstlen); \ + srclen = strnlen(src, srclen); \ + memcpy_and_pad(dst, dstlen, src, srclen, pad); \ +} while (0) + #define memset_startat(ptr, bytepat, smember) \ ({ \ uint8_t *_ptr = (uint8_t *)(ptr); \