From nobody Mon Aug 11 04:52:19 2025 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 4c0j1058N9z648j3; Mon, 11 Aug 2025 04:52:20 +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 4c0j0z6zkDz3DHY; Mon, 11 Aug 2025 04:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754887940; 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=OfWSDLZrv9Hfq78t6rPNdhOZgrWkiZh3sOq7koTLffM=; b=e+xKUe7hIQnNDch2V/It+Fpz0C2nKfC5nXQET3V+3779WivAEa3LofaMcIdLSRBa+MVnMV ZWQA4GYY5YMQL0yAJVIxraTL44/+4fZRrQQkV9WbC17h5d2EvwMU15ZBs7xlVxtgTAB43l YnKfnB53+lPE8uaRNlV5p7DQiH6V2EDEhTI6cWwsFaf0GEub/7IW4nLcL/lxHHsxYRt3bq MtwO0ucs3CFfBTIhxZWP8DLdT+WYfIt1/PdPTglkNj5XX4iUqXz/idt2OSwW7pu2lBihji r2vA0eEPy5j+tVAHyauNHBjB7OM+fBGWRdTds64nx0I0LPzmvAy+7qsAwnEHWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754887940; 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=OfWSDLZrv9Hfq78t6rPNdhOZgrWkiZh3sOq7koTLffM=; b=FjTE357AWBjtn+OdAFdIrB9T+obgzJHrpafWMEziAz5Mz0/7HXAO8MTTjwtFCcTF9YHSGc 0gQA4eO6zaarTjOv7tJohEFpZdngzq7asHmX4XB+cPCnVzwAbicoIN/rFttTRJcteoZdUD QtI5l2Qp0iNQWoDyJ5gY/zx8ypZ69S6WZLtx1Cd115eOlTh/eAcPgqV8TyTIVlhkqGr/2E l5sWNHMU7skS4XSPLuNI2z9fV+/DQZfN8u4OkBA8I95qIaRai0D+t+Z0y7MVmcqXHFmiYB tIdHxp8ie5xOwNRgSbtPnynZr0J+bFVgFVBwxB1HN8hdsjjgsf76ASP5q2uIyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754887940; a=rsa-sha256; cv=none; b=CMy3aOGZi1/Fo5fL7xwDa7IpOSoEJeq27uTcMNAuQV723TFXc0zpPTrcUtWi5taxURHKIe MDvOJscWtOyix5J06aZSbSOsygAInG9xkZRsUfsAMnL/1JErEgmU/ak8CTHjyMm12wa/Sv hveuxdIJIM/AKGAQ7bikeXOXXkEr8cqLY5cE4LhjbqLKSJRAvgMYicQw9i/DNtr8kps03u 5N3nep4OU925HVLL4Bmsp1s7SxNh+WLSpnVaHyJO8+1E2qqT1s632RO/Xf6UNuRMmJPdI1 lz3Kw3IG0XEBpsDNVQ+9jrPvPhTL5huvTzHTT9eKkRf81iPb/ymxWkxo5HBKjw== 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 4c0j0z6Prszdvr; Mon, 11 Aug 2025 04:52:19 +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 57B4qJwB071697; Mon, 11 Aug 2025 04:52:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57B4qJa5071694; Mon, 11 Aug 2025 04:52:19 GMT (envelope-from git) Date: Mon, 11 Aug 2025 04:52:19 GMT Message-Id: <202508110452.57B4qJa5071694@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: 77a0173ca956 - stable/13 - vm_page: Fix handling of empty bad memory addresses file 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 77a0173ca956f9f765920fe8195b951c525671c4 Auto-Submitted: auto-generated The branch stable/13 has been updated by romain: URL: https://cgit.FreeBSD.org/src/commit/?id=77a0173ca956f9f765920fe8195b951c525671c4 commit 77a0173ca956f9f765920fe8195b951c525671c4 Author: Romain Tartière AuthorDate: 2025-08-03 05:42:23 +0000 Commit: Romain Tartière CommitDate: 2025-08-11 04:51:35 +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 ed43a05f0e64..60295afe71cc 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; }