From nobody Mon Aug 11 04:52:02 2025 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 4c0j0g1L8nz648c6; Mon, 11 Aug 2025 04:52:03 +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 4c0j0g0jPcz3D0b; Mon, 11 Aug 2025 04:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754887923; 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=a/suUrzl1bZTCT0ws9uJfMtRMpFG+rB1JlfeGUPtctM=; b=Hi73v0LJiGNXjM6uDNEQGzz2aBcfbqVZqwQkRPUPVq6TopexNZsgCDd2ZpLMzIdUH2LKoA d5omfX7OoHaOrMsD08WbvXH+381+GUNdp7wMF6B66qLNiLlgWUeEI75+aPchRj7fwoWqTL reY+6g5l+fwqRRWVFXtPY57pz/zt8N9r/mawUgR5mgontfukvteWlJGEbwtWlWtZuaDFOn +sz/PBnoZbeww9jvZAmEb2jezLlTys66QGkxTpQ2GLzbgMrFhGUTOcloTltXkAI3M6z8c+ 53NKrWnd90OJXmr4OaW1EOUE31aZoGB0oXLUHZ+Qn+CFAbckl8qZ90tAA8V+5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754887923; 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=a/suUrzl1bZTCT0ws9uJfMtRMpFG+rB1JlfeGUPtctM=; b=gOG13h238oMCAM+hPjOXk3GW0OALH6EELJClOtRm9iuD6gRRsdukYaMJLBpTAJSeCMuoB7 nYiToZxs+UI+tw6rn6CnxyOYcAX2+zREC4cemIrjWWHtovWz/j90MaTwlgDCFolKge98oj 3aFYuC2XQfS2meHnCxQAvDgyk89In8l2/JBiYj7AIniPleR6rjT1KXMn8r4E1zX6vwm0Bs 4H4oSklXGe2Oj8aGR+7cxVx3Eds1w45572JmGYGi4fEfnZMw9PbbEbmbb29chVrfXafhJw RtBfbKLYYR183YHmtFK0A3ms5I/CF5vpONKraeWIjlL+UEuPfbHp6zR1higK7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754887923; a=rsa-sha256; cv=none; b=Qo7uNqbu3SaeDGTmbOBfxIS1oP/xO1Sxzk5MTYvQ5TiegOoOFrVZDYszpbiGg3+aODSNw8 OxQhGq9R/iBiHcin1zaN4Y10xVAjthE/N1Ng2y5bHAEqbqD3cJCxXrd7zgIMoGHMMk7q4h qeaLFfBJwxxgAIVShnKEorOUq+Zf0NhRr8SfQiTlV0NOpGylgaJoa1WS05RmhviyJw51/V XoOZBc3N6QTuAkn8U6ySRyBI8GU4cJBaoO+CBGeWXiB2oH2bgb4KCIhEdNyxg4OAVzhePg YNr0OTepqSC2iirZ97wkRYavWdUTbGTdoCen0G4YbehRqRzOf+e96fCoLcc68Q== 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 4c0j0g02Y9zf9M; Mon, 11 Aug 2025 04:52:03 +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 57B4q2gG071512; Mon, 11 Aug 2025 04:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57B4q2uq071509; Mon, 11 Aug 2025 04:52:02 GMT (envelope-from git) Date: Mon, 11 Aug 2025 04:52:02 GMT Message-Id: <202508110452.57B4q2uq071509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Romain =?utf-8?Q?Tarti=C3=A8re?= Subject: git: aa326b970e36 - stable/14 - vm_page: Fix handling of empty bad memory addresses file 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: aa326b970e36d063abc653071ca5fccdf83e5554 Auto-Submitted: auto-generated The branch stable/14 has been updated by romain: URL: https://cgit.FreeBSD.org/src/commit/?id=aa326b970e36d063abc653071ca5fccdf83e5554 commit aa326b970e36d063abc653071ca5fccdf83e5554 Author: Romain Tartière AuthorDate: 2025-08-03 05:42:23 +0000 Commit: Romain Tartière CommitDate: 2025-08-11 04:50:54 +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 (cherry picked from commit f90940ce6eb71df40538c35a65d77ad3093c679a) --- 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 f013cbc84c25..1da7ddce86a6 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -391,11 +391,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; }