From nobody Fri Nov 06 19:55:01 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 4jLqdx6bkXz6yf3T for ; Fri, 06 Nov 2026 19:55:01 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jLqdx3wB8z4FWp for ; Fri, 06 Nov 2026 19:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793994901; 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=wrwhCSRwsAuF1emYgYqql33cRBIPFeZa3aafxx41t2Q=; b=O+wq+JB+T6zEPbfCrR5624Qv5k5dvIvEpga9qYEGnG5DFmluLxIPvpiJJejAkNM6c04vPb pUhN9p2QmLQhYs1GmSVS5FMLPWbaBe1pluecN/3GGLhKuKvWgQQ7A/Zp6jU/2mNRP54JGT 9SRohHTHwEWHjHjX2KsnE6M2hcjR1nw5+DZ3D/jfj0BcCl7KkaCdG2rPHZOeogTMVS754R MivbAw5tqpz6QZQXyAIgxVGadzZfLNiwvMmsPdq0SJ7eGF2AmnmyAgdxnM0MH91CGh/etG KZQ308wfPJsl3b1amBx3kwQDcjfW396vB+1aNeI9Lotlrw72O0XNdzlQENArgQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793994901; b=mgjUJ0ceGu8Gl8MtOXqWh7VCDGdowtQXqqRy/98u4LHx2OBy+nsVvNzEsPEJbCmwtl71Ez ywvfovkb5g5VJukczJUgjNI95jBxOxuYSo4SjAbfeL8INUw407gGhN5e0c4AKuxfLLYVvC pMpwhgBk1iEoEMfCgikNDMdTZDIlerf9/YxSrlLpRTNYYmOG86pU5daMwAAhh564mFkqHK BYW77QP2n3kWd/+67dNpD9IdupabDr0k35uZ4GWDcuGJH9kDbaUs+RcYGgl97gmbBbHqMd 93hSYqRqr3xlaOugi7VH64HNMYUYaLGg2xaZ6mlRT+3DFdEoPGphvlhJdn8JaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793994901; 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=wrwhCSRwsAuF1emYgYqql33cRBIPFeZa3aafxx41t2Q=; b=lxxlre12ZWQPddvJy3DRDpmRe+dgeUBiIDB8KqDtLmzMyp4PJ88N0B3BBrlpTPdSjZLiUB aDQvWKl1QKTo/cz7FGDo21Q3hXvaInC56Pdw6swjHtaA2S/UyptF7hgn1tTBS8AzAvfUqJ PWDNrrunAmuASorLx47NvW/F8IJv8cYixh8a9k8MVCA5m/6v3+WJ4gxK/2ydRfLuOKhv2M bhEpiP7ReAFRY5REmlA8lWflFRTzGUyXGn9fGphvvdaVwaeJSrWw0m2aPWg/h1oWJuBoD+ CfNazgt1M2YcoAvELfyzy/dJ6B3HL7Ae+tKOH7Re8A+i6OEf/csw1PizO+ZEgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jLqdx3bT6zs2J for ; Fri, 06 Nov 2026 19:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ca48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Nov 2026 19:55:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 149cebf08dd5 - stable/15 - malloc: Fix realloc() for large allocations List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 149cebf08dd535e438d87f247bed25d0534713c6 Auto-Submitted: auto-generated Date: Fri, 06 Nov 2026 19:55:01 +0000 Message-Id: <6aee3095.1ca48.4cc1ef63@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=149cebf08dd535e438d87f247bed25d0534713c6 commit 149cebf08dd535e438d87f247bed25d0534713c6 Author: Mark Johnston AuthorDate: 2026-10-22 16:41:04 +0000 Commit: Mark Johnston CommitDate: 2026-11-06 15:52:19 +0000 malloc: Fix realloc() for large allocations min() truncates its parameters. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit ca16e7a4920415bf9d09cf76bd2c3cda7447c098) --- sys/kern/kern_malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index ffc260781d60..0a6a39c1734a 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -981,7 +981,7 @@ realloc(void *addr, size_t size, struct malloc_type *mtp, int flags) uma_zone_t zone; uma_slab_t slab; #endif - unsigned long alloc; + size_t alloc; void *newaddr; KASSERT(mtp->ks_version == M_VERSION, @@ -1045,7 +1045,7 @@ realloc(void *addr, size_t size, struct malloc_type *mtp, int flags) * valid before performing the copy. */ kasan_mark(addr, alloc, alloc, 0); - bcopy(addr, newaddr, min(size, alloc)); + bcopy(addr, newaddr, MIN(size, alloc)); free(addr, mtp); return (newaddr); }