From nobody Tue Apr 01 14:41:38 2025 X-Original-To: dev-commits-src-main@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 4ZRrKv0kMpz5rd1b; Tue, 01 Apr 2025 14:41:39 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRrKt6SVHz3xRc; Tue, 01 Apr 2025 14:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743518498; 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=H+wvBnk4jjjd3KtcoGzCIytSoNtrL3EEHdssStcKd8U=; b=fPA9dBVYchz3N1NHOcb6dJREe33FC6OnpFse/NEpPOotyD9MjpsDpZikVMbHN+4owNpc51 TTm8sA91Fj5LnsiiT8GU7oK5tRn9No1u2vDG9ZEbyAuLHDTxml+C3ceREf37iVEXw5XRDh +cYVcYqjhfVuo0Za+zzR7F5DGrg3iWfBxUeYzDvSgzktOPmZrstZ7yFX5bphN7g2JY/d1M TVv86b77Hcc4sOiLblhpVZ+/SyvbwMpvbGbskc8HY27d/Gf6cAy5igpZtVy3Oi89r+gJ08 bBurg6WqexB81mVSWIVO9HwGvMeuppkUSoWof6qN0bsBnfTgdIf/Ca0igiKmPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743518498; a=rsa-sha256; cv=none; b=N7KL+Qv9qh5Ooy3U6MYJ99p76Gf2jL0HJQ6/4St1xaHYRPcVQx+JYbLsmVlyp/FlMJ7PCl S3bmITz075QJPfYi6abmc8DGzNt/bLubg95kxjjvYsOlLCpG4zHewWs2wA3pC5CgOmN669 t2Xv6P3YfkUaUVpQfRUpYqAnK4xjzd7PO6f5xxz3ICTfO4GfZsdjwDxUIPnOtccpMZgsFp mNaYVF5mxCS0x1PbDjRJ/MM55v/tQ60IaUUzPJIcdfbYKIlfB5yOyUyfEuAOPbQ8E1j8SL WSm1hBRVJtoHx3qYmc+9KI1n8RoGpKtNhuUOEbF21+UMbffaz016PUpYj58XeA== 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=1743518498; 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=H+wvBnk4jjjd3KtcoGzCIytSoNtrL3EEHdssStcKd8U=; b=Tejhi51f1MxCbx+61I3aT6Ls5WhlaBZpDqHc2xoPCLx1oXiNkwo14pisxVBSlVl4o+bsjG VkHp7JWB3VasmVNmsIvEdbVmKWWtABlrNTbZjBhQsaJTRQkXk9iKWeoEJRjmaazdklDTX7 YqYy/PbtZSiwlTHPnTKonMygPOcA6+hant5x3p43oHdxC8biQ9OdJ+Jgh4gsg4nO00SyRd NtdPmKhBGqh5heEyiIRfPp3eu3AQddcFdDwdtc0MFxiYicBEuSPPW/5FkBJw//DSoXR+g3 5Lr+1MS+e1JaEt18qbyC7Oh89HJswEoRma0AQ6uRi/dMUlO2qlFlJLNJkQ9Rng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZRrKt5vbrzbfD; Tue, 01 Apr 2025 14:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 531EfcGG009649; Tue, 1 Apr 2025 14:41:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 531EfcBO009646; Tue, 1 Apr 2025 14:41:38 GMT (envelope-from git) Date: Tue, 1 Apr 2025 14:41:38 GMT Message-Id: <202504011441.531EfcBO009646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 19efc9e6320a - main - LinuxKPi: lkpi___kmalloc change a < into <= for proper boundry check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 19efc9e6320a30e230b0b40d5bae90142ec13aeb Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=19efc9e6320a30e230b0b40d5bae90142ec13aeb commit 19efc9e6320a30e230b0b40d5bae90142ec13aeb Author: Bjoern A. Zeeb AuthorDate: 2025-03-29 14:30:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-01 14:40:25 +0000 LinuxKPi: lkpi___kmalloc change a < into <= for proper boundry check lkpi___kmalloc() would use contigmalloc if the requested size is exactly PAGE_SIZE. But we can still fullfill this request from malloc() without losing the guarantee of physical contiguous memory. Sponsored by: The FreeBSD Foundation Reported by: emaste (in D46656) Fixes: 19df0c5abcb9d MFC after: 3 days Reviewed by: dumbbell, emaste Differential Revision: https://reviews.freebsd.org/D49570 --- sys/compat/linuxkpi/common/src/linux_slab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_slab.c b/sys/compat/linuxkpi/common/src/linux_slab.c index 5be4c1ec674c..bc780ab3f609 100644 --- a/sys/compat/linuxkpi/common/src/linux_slab.c +++ b/sys/compat/linuxkpi/common/src/linux_slab.c @@ -215,7 +215,7 @@ lkpi___kmalloc(size_t size, gfp_t flags) /* sizeof(struct llist_node) is used for kfree_async(). */ _s = MAX(size, sizeof(struct llist_node)); - if (_s < PAGE_SIZE) + if (_s <= PAGE_SIZE) return (malloc(_s, M_KMALLOC, linux_check_m_flags(flags))); else return (contigmalloc(_s, M_KMALLOC, linux_check_m_flags(flags),