From nobody Thu Feb 17 01:18:56 2022 X-Original-To: dev-commits-src-branches@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 70A4319D352A; Thu, 17 Feb 2022 01:18:56 +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 4JzcRN2mpgz4kZZ; Thu, 17 Feb 2022 01:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645060736; 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=ggp8VOG8u6EKa0LS9pzjU522F2wy0VLRq2qKxNqJRi0=; b=aYwY3PofwL9meHVakmvkmWRyyckT61lYXdTxHdXb9AIQaGM0YfLOlg0VFoEz0S8LQ+gS0P 4kUadrFczGPdyj2y6ZZZWV4Hw0rv3DrLRCCc4mZFppHJhms8W+Jpb32Vb2HheEqVLps2ov n3uMT8N7h+jj9r7DvgzVOTO3wYavP/mYFUjj2HE7qztH25fIcGwv+5Pe4w7I/7Ygz7xeEQ 9PF6SQlIXxq/LfHrU+xEp69h+pxIhgsOcEXAqwx5ZjMoGdQXUjyKHgy79mqIE6Fz9PTGrA EIccgQ14hmPCDWLfIyfc9hTJytPevIO1xrJAh3p314Eb75bnjbkbA9pvjjHpkQ== 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 3F3F720B1C; Thu, 17 Feb 2022 01:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21H1IuaR042911; Thu, 17 Feb 2022 01:18:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21H1IuiP042910; Thu, 17 Feb 2022 01:18:56 GMT (envelope-from git) Date: Thu, 17 Feb 2022 01:18:56 GMT Message-Id: <202202170118.21H1IuiP042910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 503ac069aa4c - stable/13 - libkvm: fix kvm_walk_pages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 503ac069aa4cabd8fb3aeaec705c5c926e39d452 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645060736; 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=ggp8VOG8u6EKa0LS9pzjU522F2wy0VLRq2qKxNqJRi0=; b=oc+US2pWadDh0tnMEhBEdLQoQbjhLvArIN2tdieovehN85v+XC2gtwKNZbeg8qECj0JTuU Fnf6vpsCPvHvgClU2FoHYULJNLaHVlYBzm9akPQjnWRHXYfjnMMsUpoje42anZWco7HLo7 Rhi+4C44FCgVgbrwJ56bo7k2F2lE9QkhA0TEa80g58kPuBHy1Be4sOLxcz+Fa+PSKcVj5V iMCTpGJRjT1crnAwc6IRc7eFvSJ+2feieRVj8axF44EpgEJ5cVbkKPdxgs5PRpolaxvWtm h52/fXc1VTLHX88nWNgSsqU1/cTrKMyB+DQZ8qF+qb8NrCUQeqwBWSyaNprTxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645060736; a=rsa-sha256; cv=none; b=GO9Mi9YxvKrD9f8k3XYtkDjotH1hgWNxudEi4zBe4AUeZkIIn0mKUBhOaJ8r/JLDDNP5Sa tQlLAiGliqR/7+Tonn2feBfOVVwMhQUORkoNivyja5cYe7Rq6CCfQzYEwV24kU88g/PYvp QTrdHGK7dYB0PHBmMBCeFBMI+CY2mc/Pm+ga394IeMaGA0tBVRmBYsVOJCbhI61xQRi8xG obyAI9jiz8baGUQrIaf4g7HGkBRvfysUmhhY5MsdhS/QMJpc/KsKecjGuCPUeep5JvtnPp Z+J+xdOBiSBB/h+hRTChVTur3ROYfWotrdJVk/5tPv6yvuTi7fNiem98KfFnxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=503ac069aa4cabd8fb3aeaec705c5c926e39d452 commit 503ac069aa4cabd8fb3aeaec705c5c926e39d452 Author: Bora Özarslan AuthorDate: 2021-11-25 19:09:26 +0000 Commit: Ed Maste CommitDate: 2022-02-17 01:18:32 +0000 libkvm: fix kvm_walk_pages Correct bitmap operations in _kvm_bitmap_next. Reviewed by: jhb MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D19183 (cherry picked from commit 08055452cbf24a3cea48cb4f665bab78d89b7a39) --- lib/libkvm/kvm_private.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libkvm/kvm_private.c b/lib/libkvm/kvm_private.c index d853d1643101..a45f66caf2fe 100644 --- a/lib/libkvm/kvm_private.c +++ b/lib/libkvm/kvm_private.c @@ -792,8 +792,8 @@ _kvm_bitmap_next(struct kvm_bitmap *bm, u_long *idx) /* Find the next valid idx. */ for (; *idx < first_invalid; (*idx)++) { - unsigned int mask = *idx % CHAR_BIT; - if ((bm->map[*idx * CHAR_BIT] & mask) == 0) + unsigned int mask = 1U << (*idx % CHAR_BIT); + if ((bm->map[*idx / CHAR_BIT] & mask) != 0) break; }