From nobody Mon Aug 4 03:45:04 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 4bwMrd0n9Mz63VhH; Mon, 04 Aug 2025 03:45:05 +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 4bwMrc75dSz3TMc; Mon, 04 Aug 2025 03:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754279105; 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=KMikWwkYHiLARbqc/R17r2V4qTlyOP7Dm2SjcCmvRQ8=; b=xktG31tGeUzN9fZeXwG2AU6rh6ox6Y6utWWtM0WTUfnVqSMwZy6CJsVp5wj9fZ0i+icIMG tTn9P6r8z/yhiW0PQ4vj9NV19x0qEiGCaGf6wW2VRbsulmmmJ/6qvg58TL1Pnbml2cY35W P+D6USDi7b4urAq566wzpdxRDauRWb5pyqYT2M7jVCSSgdUNkgZ3XnUKcyXA+ZH6NiUtUa 8k3HnpFaSy+KNCUoi/oMGRFSud8tbZd5+REkEC76PTzPgW4TlnR/0IWzONuj98ZA30C5fX YYPjhsGETgcMmF/CuldOecic+b+FgbeCR3R9uHjtgHq9LeVgAtAZjh9NgXWPrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754279105; 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=KMikWwkYHiLARbqc/R17r2V4qTlyOP7Dm2SjcCmvRQ8=; b=S6uYMRq4kPPAs0U7zhoq+gQIVTZUINXTPceRw1YYqWZoTR+snoaysa/wosJfUMBx6aAzAy 8v+RzcbuN53kUs4Hv7MLZh5vJ06/zIcvvgoIFppV2JfsP7Deo4a7rxwIrfO7FGhatJeqza 2nzHBB2KShaQ2uI5pSrKSMAQAiJtcH3gDAE7fYBGoqR6c7zSevLzplLGBPJ9ut3zMVCGBj H1vochLgHxROIaFlRdQLI1tuzK5bCCriRSkDZiTnmdYt36eHc0N6/jA5G9Y8mhGEYDZMX7 NYAnljH+eowkEe+O1qKfMS1Q0cN7B0lP7OiHrMa296UYE25Oabozlaw56QCIZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754279105; a=rsa-sha256; cv=none; b=WCnn3kHSBM927HDBtZbVuzgcpTBgHZa6J9eeJlZ2JBj24Mhcsn867pZMrRrhOj9kKS8Q7Y Nf+Jc6MTIVkQP8o+iQLKsQodlQHupoqX5+O44AsD6KPZz4Jg6Dks1fD80ZBf0pZvUIEN9E 6SL4kjVvK67otfUACa/8U+J4xqicFjGhsAJEbdRgan4qWYL/b2n2Ljpq6q7pmgZL6u5nhM xgOgPB+Lpq7ZtXfSYaZkaAeFV02c8wzdDtqY4bFeNQOSpTx6to4jI3Gt80wLZUeOWCtHqi xmylruujawXyZGaAobQMnu7XqIX9NZHU0BmDaojAYXD85z+iqf+AGOEqcC/WLw== 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 4bwMrc6ZxyzYpp; Mon, 04 Aug 2025 03:45:04 +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 5743j4gx087815; Mon, 4 Aug 2025 03:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5743j40Q087812; Mon, 4 Aug 2025 03:45:04 GMT (envelope-from git) Date: Mon, 4 Aug 2025 03:45:04 GMT Message-Id: <202508040345.5743j40Q087812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Romain =?utf-8?Q?Tarti=C3=A8re?= Subject: git: f90940ce6eb7 - main - vm_page: Fix handling of empty bad memory addresses file 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: romain X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f90940ce6eb71df40538c35a65d77ad3093c679a Auto-Submitted: auto-generated The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/src/commit/?id=f90940ce6eb71df40538c35a65d77ad3093c679a commit f90940ce6eb71df40538c35a65d77ad3093c679a Author: Romain Tartière AuthorDate: 2025-08-03 05:42:23 +0000 Commit: Romain Tartière CommitDate: 2025-08-04 03:40:24 +0000 vm_page: Fix handling of empty bad memory addresses file If a file with bad memory addresses is configured but that file is empty (0 lines, 0 bytes), when loading it we end up returning an end pointer that is just _before_ the start of the (empty) file content. Adjust the code to make it clear what pre-condition are required to set the *list / *end pointers correctly, and explicitly set them to NULL when they are not matched. Reported by: marklmi@yahoo.com Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51717 --- sys/vm/vm_page.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index b239a6ffb4ce..d3772af3c284 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -394,11 +394,15 @@ vm_page_blacklist_load(char **list, char **end) ptr = preload_fetch_addr(mod); len = preload_fetch_size(mod); } - *list = ptr; - if (ptr != NULL) + + if (ptr != NULL && len > 0) { + *list = ptr; *end = ptr + len - 1; - else + } else { + *list = NULL; *end = NULL; + } + return; }