From nobody Fri Nov 13 22:07:59 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 4jRBG75gLLz6yC76 for ; Fri, 13 Nov 2026 22:07:59 +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 4jRBG73Mcwz3KhV for ; Fri, 13 Nov 2026 22:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794607679; 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=JTh8MN3QXnQmeUnQUePY8+G0H3BbEF83RQlrUGFkfsY=; b=XtnOoHFWyS6t6mrx43LbJZcUSQ7uQYxnR/nxnd+nn9WtfDy1wpw3LPu6S1Lx3EKErPQ54B qPODXWy5uUnW0AhvI4i1onKmKvTivJIwK5X8g78FWkLtGLAzK2WbXuIXoVgAFTyUwbgd1P jiabRtQ5wgZ9BqiKRr7/PGcJTMbXvtaRXF8r7NDlSDxekIvpsBHzTk0TboNSMrLkEJgQvW ZomOY8FxuGLpE/xdfAKaDkDjMKJTQyLWoT7MSh6gOSRKCOYdUlXZZn8VDFxcjL5NRmwP4V pkAjTlyg5D2fsP/EispV2C5BWGS/8rDHxZb9v3jKsTqL43pjdvK4b1apIcVzWg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794607679; b=UcxD36xAg5Gqa1hjuoPZLqBtOtu6iyPWCVKT0poYisyVr1C5TdaCd+Y2v72vbDeZsrEMNp a//kl7Lyh26k0E1x/kt+qGs2IeJUA4G7bYlRJ5NJnUdM3WxembrtWe4+8xEFsBjYXYry2m eZNh49LofdgotM8LoIuQMCbN6P5BjIuFDpJZ8j8Nvef3WxMCXCS78lXiFjo9QUJxfQWNwX zu3vSh0MLr1x4aXdN5o7C/5duEA9FFCQ3+CHoxEGwH5zd+nn2pIXvnYYLuqC4ZuEQ5Q2Zy 3XYDlUU5FZYjCxwrqoU1+PPGIY/q4ati/hDrrx8NOr/LuMvDCSkNOON+5K+t+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794607679; 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=JTh8MN3QXnQmeUnQUePY8+G0H3BbEF83RQlrUGFkfsY=; b=r4pmVFYewiTyhvXdEmTLYzTwWVU7bvn6EayoIBdE6tJ/8PFecANiQRBhMjPs2bFsQfDA6n lPb15a7OAB8F8eEfG/Tg1T4XsWEK8KYXfOLAc6d2hsg83TqQnyx5wCmV0gcEvKIcPpKqp/ xoLTVb76eCiv79FU4nzQXuzJLyE6Nds4UNZ7bNqVcwRVqlUqjceglmg+cVmAvbKsln75JG WIk0ht9YGCxMS07jE09jGZFO0t7mDniQ3ivQtHeyn/NrXtWF+4O6ujvzJf7pTsTt37CPE2 K/Insmo3T7VZlnxxx6vIiQ1uWF9LhkTQggc3/8+KOBsxwTdc1HWwLVsdXoEiqQ== 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 4jRBG727pLztWg for ; Fri, 13 Nov 2026 22:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id dfdc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 22:07:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 65b025170b64 - stable/14 - 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 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/14 X-Git-Reftype: branch X-Git-Commit: 65b025170b64986b9ad114aa23a7b14785c3cf20 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 22:07:59 +0000 Message-Id: <6af78a3f.dfdc.2afff155@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=65b025170b64986b9ad114aa23a7b14785c3cf20 commit 65b025170b64986b9ad114aa23a7b14785c3cf20 Author: Mark Johnston AuthorDate: 2026-10-22 16:41:04 +0000 Commit: Mark Johnston CommitDate: 2026-11-13 22:07:32 +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 cbbe02085579..6ed526b1dfd2 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1031,7 +1031,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, @@ -1095,7 +1095,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); }