From nobody Fri Aug 25 01:08:30 2023 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 4RX1zf4l0nz4qbBN; Fri, 25 Aug 2023 01:08:30 +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 4RX1zf46Rpz4SMc; Fri, 25 Aug 2023 01:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925710; 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=QiyGrbXWmuvdFEhOT+xoqF0X5/OMsY+tfE9el+5w9pk=; b=EkOCbSKbqId/mGCEO65/vm+FEg+vy1ptqo0QIhBUX7zBHMcngu1FJc+QR4dVKtcL++uSLg +jKWXigBJOHEhqke+/MJSTpLI+0SeRw34Ohwp3IDGmpK1HGImb9tRE/gd2ME4Vjh9aSvWQ dqhXY38IxuoRUKm0UtskqUBTvqJpCuwtSsZQ9aRfFrYJBqvK95O44KP846m9nz/hW0ERca w/F9ZgvkO+wVor2GQGmuFPLWmbVv75ARpz7mhhSrUoOY/Vz64sfgDOy6zko7K5oP2XjmtH J1de5mOXX1xFYXgypvo378ITTzphFDJcDkI7na5YLLm0/jR/FLPJlcRNKbMwJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925710; 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=QiyGrbXWmuvdFEhOT+xoqF0X5/OMsY+tfE9el+5w9pk=; b=a7RQoI+2MVkHpfAa+cuwepE6GqhHyD2KTzrHQAgx9SH5IsScMITdB6uLLq5TAcltiYHbRM 9UAfyC27DU2piawj36qqNxNEXIfm3koiLeY2uixWSLvoEWMenTFfRJp3wbUOYuNMecPvkY kgbcGOu3RNDn08og2cPtUKR4kTJdZreQFULQHAyO2BBc4a3qm2uLvxnSFpJp1s5bq4jk7u be6QJa3gmbzGUTtH0JWQHffl9wfREgUvrEoMetEniKUalD7a3xcmMJTKY23YFv3EzIwvG/ iBDh/pESKznvyEGGxqnzR42JuIObdcVaahbUoZmU6HPvLvDxGxXAM8b1WyPwlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925710; a=rsa-sha256; cv=none; b=gOge32BmkZhzQuLXnYgySbXdR4OwCOITTya3DrF8kbyjfitEI//1MyEr7xGPgo0Usggks5 DeVWDg7F+5E3oMJbs6rai5lX/gm1sliXOMFYU+MweBZYkAbC7ptUSdahchHKp7iEI8nZeE ko4+0yXlKhBWo8FlpjTLutVldc+RTWeLfC8rm1s2FSOueiu1ucqg4eq1LPoB7pi/Ivav6p bywQAUu4fwazYS+kfGNMQ6gejV6bvuSy2oz/qtGBMFymKS+oJWAt+ZOdyjj4UKcxri5fPO rEDLvrpF/g9lRJwGwxJRTQ5i8Ixls+kuFnUntMPoXNdezOk0a1DwTQd9HiN6YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RX1zf3CLNzpC9; Fri, 25 Aug 2023 01:08:30 +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 37P18Ulp058177; Fri, 25 Aug 2023 01:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18Uck058174; Fri, 25 Aug 2023 01:08:30 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:30 GMT Message-Id: <202308250108.37P18Uck058174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2fab20ed1bc5 - stable/13 - vm_map.c: add CONTAINS_BITS macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2fab20ed1bc565d42d4080b9a8ee81fffdfaebff Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2fab20ed1bc565d42d4080b9a8ee81fffdfaebff commit 2fab20ed1bc565d42d4080b9a8ee81fffdfaebff Author: Konstantin Belousov AuthorDate: 2023-07-29 17:52:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:43 +0000 vm_map.c: add CONTAINS_BITS macro (cherry picked from commit 0fb6aae7f0e19c0628c398bbe30297ef9245030e) --- sys/vm/vm_map.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 27360f70e1e1..9588f0591bcc 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -146,6 +146,8 @@ static int vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, static void vm_map_wire_entry_failure(vm_map_t map, vm_map_entry_t entry, vm_offset_t failed_addr); +#define CONTAINS_BITS(set, bits) ((~(set) & (bits)) == 0) + #define ENTRY_CHARGED(e) ((e)->cred != NULL || \ ((e)->object.vm_object != NULL && (e)->object.vm_object->cred != NULL && \ !((e)->eflags & MAP_ENTRY_NEEDS_COPY))) @@ -2727,15 +2729,15 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_map_entry_t entry, first_entry, in_tran, prev_entry; vm_object_t obj; struct ucred *cred; - vm_prot_t old_prot; + vm_prot_t check_prot, old_prot; int rv; if (start == end) return (KERN_SUCCESS); - if ((flags & (VM_MAP_PROTECT_SET_PROT | VM_MAP_PROTECT_SET_MAXPROT)) == - (VM_MAP_PROTECT_SET_PROT | VM_MAP_PROTECT_SET_MAXPROT) && - (new_prot & new_maxprot) != new_prot) + if (CONTAINS_BITS(flags, VM_MAP_PROTECT_SET_PROT | + VM_MAP_PROTECT_SET_MAXPROT) && + !CONTAINS_BITS(new_maxprot, new_prot)) return (KERN_OUT_OF_BOUNDS); again: @@ -2744,8 +2746,7 @@ again: if ((map->flags & MAP_WXORX) != 0 && (flags & VM_MAP_PROTECT_SET_PROT) != 0 && - (new_prot & (VM_PROT_WRITE | VM_PROT_EXECUTE)) == (VM_PROT_WRITE | - VM_PROT_EXECUTE)) { + CONTAINS_BITS(new_prot, VM_PROT_WRITE | VM_PROT_EXECUTE)) { vm_map_unlock(map); return (KERN_PROTECTION_FAILURE); } @@ -2766,6 +2767,11 @@ again: /* * Make a first pass to check for protection violations. */ + check_prot = 0; + if ((flags & VM_MAP_PROTECT_SET_PROT) != 0) + check_prot |= new_prot; + if ((flags & VM_MAP_PROTECT_SET_MAXPROT) != 0) + check_prot |= new_maxprot; for (entry = first_entry; entry->start < end; entry = vm_map_entry_succ(entry)) { if ((entry->eflags & MAP_ENTRY_GUARD) != 0) @@ -2774,12 +2780,7 @@ again: vm_map_unlock(map); return (KERN_INVALID_ARGUMENT); } - if ((flags & VM_MAP_PROTECT_SET_PROT) == 0) - new_prot = entry->protection; - if ((flags & VM_MAP_PROTECT_SET_MAXPROT) == 0) - new_maxprot = entry->max_protection; - if ((new_prot & entry->max_protection) != new_prot || - (new_maxprot & entry->max_protection) != new_maxprot) { + if (!CONTAINS_BITS(entry->max_protection, check_prot)) { vm_map_unlock(map); return (KERN_PROTECTION_FAILURE); }