From nobody Wed Oct 28 13:07:20 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 4jF71j3xtPz6xRpg for ; Wed, 28 Oct 2026 13:07:21 +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 4jF71h5HdWz4K0m for ; Wed, 28 Oct 2026 13:07:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793192840; 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=HU5zBCmtessruGzdY9jUKWUQdRhQJnD2y3Kmq4E0NYU=; b=NamX+qvxabopumE2gLe7sUWZ2HU513uXSl4Rx5thukm5Sd2+zoQ7+RYz3Hsg9EQFa6hM+R ZMgQWk7ywuSMHsWciWJ62Q01UWaNA/fGsemQDGCzYe4URRVcBBpFvP1w7q0KEFJRFdsu/2 rY0qK28W212XlAkGXcfqV22KoDHQeNnhMKgzi+PA+XvoGHPBOV/zCpaEz6YYO+ty6VlIae kO4Lv04xtAg4Kekk/958teBslc+oj4Ckt11KEwe9Xrz2Zp8rFa+DTZLWuH5MuzRIHS6mva n1Mn70fCnINgBVG/2C+2qYEdquQxYzcRxXQyHtJSpC/vNbhtnKbHW2wZwb7aFw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793192840; b=gjdfVcNOKo3lWJu+nuMaDJPNn3l81p+XlDGsXzvhGEEmn3KG39X0p1vEFoqRUAFo2P6jtj Iz8vKprkd8FGWiQlwLnukhomL10w7jzmte7CiIZ4nGbZYoFVX9v4K47b1ahpaCEUrmht8u Q1e8dNhDuOKUo6GC1cpZSHNmX7WzAHkQuE8fgrJ046tdwbtLf07t8GlEFp5UoBxJYzKPdt RD7t5E0yvjj8wzzXy0al0uEkPXsom7d2cTuSLg7lUQVKDdOa5RCIP4j0xHotsEpKjgHsri eYvbz0FrEkdjd2hxSQreangIoFF5c5aoKSgARHneW0uINEryPZ0Uff9zcrQlzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793192840; 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=HU5zBCmtessruGzdY9jUKWUQdRhQJnD2y3Kmq4E0NYU=; b=Yh7tHA3mvbSoqAMxkujxRokkgKRK4LY8WmiTH2elxseMBbWD5KmCMJAvSZqWI14mOlW33W +8cX6qKo/IIIIqCx2NYNMRwujpVfaJy6nVFkzBPPc6/35OzQTdbAZGndje0kPedvHeCPQN Z19BoanO2Js7jAWMCFnK/CFZoYklEj3xM5OmpUJWI4vXAkliB7eARflVt34UKM5CAaL/BQ 402odLUknCduD4O+1PI5g6X1aZRlkKiyrbnyawZrnFsLbnTMQc7+23G8OawijCv5jNq8XM /vKJXY5VWIZpWU8e6CuH95Ctmfb0o9ozF6Os6+k0gSVGHYvWVgV7dXOsa8lZSA== 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 4jF71h3Vw0z18L2 for ; Wed, 28 Oct 2026 13:07:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a1f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 13:07:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ca16e7a49204 - main - 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/main X-Git-Reftype: branch X-Git-Commit: ca16e7a4920415bf9d09cf76bd2c3cda7447c098 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 13:07:20 +0000 Message-Id: <6ae1f388.3a1f2.2a8f0fef@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ca16e7a4920415bf9d09cf76bd2c3cda7447c098 commit ca16e7a4920415bf9d09cf76bd2c3cda7447c098 Author: Mark Johnston AuthorDate: 2026-10-22 16:41:04 +0000 Commit: Mark Johnston CommitDate: 2026-10-28 13:06:58 +0000 malloc: Fix realloc() for large allocations min() truncates its parameters. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- 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 d2dd7ec5acee..6f3c3222daca 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); }