From nobody Wed Jul 26 05:25:37 2023 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 4R9j6B0YLdz4pYtc; Wed, 26 Jul 2023 05:25:38 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R9j6B01nLz438X; Wed, 26 Jul 2023 05:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690349138; 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=W+Cg7tBp0RRbwH8L5i85mfWFJio/piPjUPDrICLX7Xs=; b=OvSscbVBcitx4LjXcB1X83v7Y8IZl78YB8/NimYAlYNJ6f4gnp8QubtX3KjjBws3hb6vhT uhWG1T7EGBQzT03E9mKdeibZV68gRnBEgDI3wM8OaFR9PGdQcSyf97liHhg0rDEpg951SP nUA86EtVPgVEgv6dRecAt2BdLE15sE6BgIonYNMKYafFmK5TjrHJ+ZF1zrrIESdJ29vivv 3/kFaJY8+P7XpONrbrCq/A+ce/VxpOKOSGgilXRxOEdykoqPBZfeyI22J9UL+fTHZmwlZk ve2yMZ6v4VcXzsGs6eB7LqZDJP9HpZLeMEoDei4kluqdtrH2CyDv76/eagNh6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690349138; 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=W+Cg7tBp0RRbwH8L5i85mfWFJio/piPjUPDrICLX7Xs=; b=h+W7QOq9+TXGqcuIStYFB7ZFg5kgHwMV2tz1MacL4RFtRMoMddmxxA2takfXd0zOmhrFfO Az4GBokcVKXdSgSNdTOAelX3c021hP6MJb7l9Hhv73pH+55f+df/czIKer6v8cWGYI/IxN VE2usjU9w97sTR+YCIdMDatYohRhsUOBUT+wR2aWCd/+9cAjSRRddDIBB9mYXlI2tlUwY7 JCrDjTv/40FcPgtf3g0w3SqqZyJBEnUGWDPPt5nPrzJAAfZDIL4XBb/WELOavdWGsR6WGc urrmzNiF299FY1/ZjUzJx7MjQkiyhZTReztKKE0MuQ6ZgQPcfL0zNyxdz++oyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690349138; a=rsa-sha256; cv=none; b=p2rIl263CJuc5mLQSzIAFhtx+WgZDNqTJ4RTKngxqumOckXV2AbKaW7xFLdTjwOlVCJUIe Mwu1s1nt/fEpiiidnOJIOoHnj2455z+2EXeOZZngCkjt+vdMyMOiFdZMoQz8n9SFaV0w9K fonc5WRJ0MMkpdrCKCANrjB+6AnSV5+RyiU5nKLNIhvcRvA7BHnezIOxuUXR/f2uJ9Ep7I rLSycahfYZoMeOfB2db2w7B1Ty0RE0V8bxUFEXA5aeeSWx5xdbeY+XLTH1KpNr9nLb7joY p/9HYQ4dVb7c8PMWcjB54nv1z5sQcPVHg2I0JClHC6JElJKKdGkUMrvGLCEAxQ== 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 4R9j696DDPzW45; Wed, 26 Jul 2023 05:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36Q5Pbgw027007; Wed, 26 Jul 2023 05:25:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36Q5PbRm027006; Wed, 26 Jul 2023 05:25:37 GMT (envelope-from git) Date: Wed, 26 Jul 2023 05:25:37 GMT Message-Id: <202307260525.36Q5PbRm027006@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 50d663b14b31 - main - vm: Fix vm_map_find_min() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50d663b14b310d6020b4b6cc92d4fae985f086f2 Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=50d663b14b310d6020b4b6cc92d4fae985f086f2 commit 50d663b14b310d6020b4b6cc92d4fae985f086f2 Author: Alan Cox AuthorDate: 2023-07-25 07:24:19 +0000 Commit: Alan Cox CommitDate: 2023-07-26 05:24:50 +0000 vm: Fix vm_map_find_min() Fix the handling of address hints that are less than min_addr by vm_map_find_min(). Reported by: dchagin Reviewed by: kib Fixes: d8e6f4946cec0 "vm: Fix anonymous memory clustering under ASLR" Differential Revision: https://reviews.freebsd.org/D41159 --- sys/vm/vm_map.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 444e09986d4e..eb607d519247 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2255,10 +2255,10 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, int rv; hint = *addr; - if (hint == 0) + if (hint == 0) { cow |= MAP_NO_HINT; - if (hint < min_addr) *addr = hint = min_addr; + } for (;;) { rv = vm_map_find(map, object, offset, addr, length, max_addr, find_space, prot, max, cow);