From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95623311597 for ; Fri, 1 May 2026 17:31:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777656705; cv=none; b=A+ikiAXnH6OXDpE7+v6HSHDmAI8y/KD0t7PNyrWk7b/OoUzXAVAXFIkwiKDK9eQBx6BN5c7Kttn4f4zykTDrZaNELbgWp2Zl6/JSd9TwVy2qlSojqEITCdw2Oral9kxHEWBgM/4aM6nmOoTmKe41rIkbu3YooEXCxmfmNhYTY98= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777656705; c=relaxed/simple; bh=xdZizfPZKLSRqt6VhXLq1pR8tVm/kIHc6x9MNeb8mmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Nq6ac7xhGoDty7whwZtW2rrEe0iRd6JS3HC+7CmNMHeQAcn26q0ciJDsWEVmDB0XUW2+RfrGMduSvHa5LH0paj3VxmhuSGwCsDY0/9TJsGnPqABarGS9MHgvdEcdoilR38WlRNIC3WoaK81iUFu0nXXQLKFXaGh2E57dEZgvthE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k8QSf/EP; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k8QSf/EP" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2ab46931cf1so20740825ad.0 for ; Fri, 01 May 2026 10:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777656704; x=1778261504; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kl2Z21aRDWvEO9ZM3F5D114Gv3b0H+mzb5aSolSK6U0=; b=k8QSf/EP+P453ZDslzODZIeApbVIQijgwuMi/VTHvOrm7Wy9ssAktIXk/o5TxvGE8N v+aOI6n0318R/0eHTvnTe9ySJ7GwzZvcBVomcJqrEg5shEK7M0VVOwR75Mlow+6CBMfK UDc2rFF8TQYI8jRTLiBM65pYMyASuzx8reMMv3peDojGiEWaWNXGlW6iDYNRcv5y2M3T m5HR1Fg2Y1PPLapNLgmSZBXDsJKxH7MtTanYDBsChasEZ8R0nUjCIAvKbsKyvJvVCBEO bXVHMgU67VHyv76tbr34g4HbludLj/lYR1hyO4dYEc4NV03/C+8DAFdFVaH/ee+vTOqK eQ3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777656704; x=1778261504; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kl2Z21aRDWvEO9ZM3F5D114Gv3b0H+mzb5aSolSK6U0=; b=ChOBUYjXO14LozZUC8GkSmMsWElM3/uYtjncocXlUg30FU47kZ7XNN2svb+JIM6y07 rAr2iSPmv5zvRpNNM2Dm7RO3ozFnxnTvE3zu0JIZ8u3jwC5W68QnmfqF+zbv10HuU5SE KKCZf2qEwihtyCG8GWtCPw7RPEH79TI90sHPgXeY4LX65vJOlHIgBFSxKQWby9WZsplK ZIo1a7oBhGWEdreNQuIlgdvtievjvd5JdZOmhKYIej4ovFCJCmq0JlJZyfxlB/diM5yS +V5f6QmFvLHxf+To4fXbLacwJAC8lZWlIQSbUl2bS7abZNMZWl0icoDMt+mekIiPdd6W Rx9Q== X-Forwarded-Encrypted: i=1; AFNElJ9k+GO0FzYx36Rh0br1CqZkS4NHBGq1j4NWfUOFv4XvEnQaSPF6KtJqx4OGeaeFzeYeLxyDsxZRt96jSJU=@vger.kernel.org X-Gm-Message-State: AOJu0YwZVpeIQ3+05w8viZLt3IBLB3FxYapEIcCtz3vWNbBXMavZzlV2 CrN0f9igeUVc6RcqavA6FjWvHZV9N/+5f3+cU9M3WrhO9FmcJIdrFKjl X-Gm-Gg: AeBDievljGpbDYm4M7dZvSQoADsMw2O2LqGFDCUsOMn4iJDI1kuoLThJqIHjULc7Let eFwuTFwEQ1KzFb+f2xDet+pL0eZm/Frs2h2ZAifUdcDaLNP1N4No+JIP9SjOvqwLt9r0iOicZtL EVwCNLcQuN1JWmMOq1xyXTtM2ytl3FSIn9OZSMxKOOaI2fEAKgKueAzpJYKEpw0j7k+xMeVvKBD j+umeHGfVWzTGWzHMFUg3bzby/uYlU0gmngRmtt17ECToyg124530F+TzYdpRKvgFuSevqtNkyc doLK58h7P7tqvb7ddE0GN+mq1dp5lGBzeohV/mD5M8u570dq6h2LAE8A2+pj+grcEQbBbrJTAtj YJEqU0TE0fiy4ue9jKVq+dm2Vv7UpvyGWef9LLycsR137WXBkpDyCezLwYpDhpLJTf7U3azvGbK JGfeexHrq1W48zgodHyfTkia3vYhTvQNrF1orm9F2g3Vvf49j1 X-Received: by 2002:a17:902:868d:b0:2b0:6068:4c5f with SMTP id d9443c01a7336-2b9a42fd480mr45822995ad.8.1777656703888; Fri, 01 May 2026 10:31:43 -0700 (PDT) Received: from laptop ([2001:4455:8025:be00:15cc:43cd:8af9:5a8e]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b9caad2459sm27094895ad.33.2026.05.01.10.31.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 10:31:42 -0700 (PDT) From: Cris Jacob Maamor To: Mike Rapoport , Pasha Tatashin , Pratyush Yadav Cc: Alexander Graf , Andrew Morton , Greg Kroah-Hartman , kexec@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] liveupdate: validate restored LUO FLB metadata Date: Sat, 2 May 2026 01:30:53 +0800 Message-ID: <20260501173053.73116-6-crisjacobmaamor@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260501173053.73116-1-crisjacobmaamor@gmail.com> References: <20260501094637.38650-1-crisjacobmaamor@gmail.com> <20260501173053.73116-1-crisjacobmaamor@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The restored FDT contains the physical address of the LUO FLB header, which LUO maps before using the restored FLB metadata. Check that the FLB header range is KHO-preserved before calling phys_to_virt(). Reject invalid page counts and counts above LUO_FLB_MAX before walking the restored FLB array. Signed-off-by: Cris Jacob Maamor --- kernel/liveupdate/luo_flb.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/kernel/liveupdate/luo_flb.c b/kernel/liveupdate/luo_flb.c index 00f5494812c4..e80032669cea 100644 --- a/kernel/liveupdate/luo_flb.c +++ b/kernel/liveupdate/luo_flb.c @@ -162,6 +162,7 @@ static int luo_flb_retrieve_one(struct liveupdate_flb *flb) struct luo_flb_header *fh = &luo_flb_global.incoming; struct liveupdate_flb_op_args args = {0}; bool found = false; + u64 count; int err; guard(mutex)(&private->incoming.lock); @@ -175,7 +176,14 @@ static int luo_flb_retrieve_one(struct liveupdate_flb *flb) if (!fh->active) return -ENODATA; - for (int i = 0; i < fh->header_ser->count; i++) { + count = fh->header_ser->count; + if (count > LUO_FLB_MAX) { + pr_err("Invalid FLB count: %llu\n", + (unsigned long long)count); + return -EINVAL; + } + + for (u64 i = 0; i < count; i++) { if (!strcmp(fh->ser[i].name, flb->compatible)) { private->incoming.data = fh->ser[i].data; private->incoming.count = fh->ser[i].count; @@ -620,7 +628,20 @@ int __init luo_flb_setup_incoming(void *fdt_in) } header_ser_pa = get_unaligned((u64 *)ptr); + if (!kho_is_preserved(header_ser_pa, LUO_FLB_PGCNT)) { + pr_err("FLB header is not KHO preserved: %#llx\n", + (unsigned long long)header_ser_pa); + return -EINVAL; + } + header_ser = phys_to_virt(header_ser_pa); + if (header_ser->pgcnt != LUO_FLB_PGCNT || + header_ser->count > LUO_FLB_MAX) { + pr_err("Invalid FLB header: pgcnt %llu count %llu\n", + (unsigned long long)header_ser->pgcnt, + (unsigned long long)header_ser->count); + return -EINVAL; + } luo_flb_global.incoming.header_ser = header_ser; luo_flb_global.incoming.ser = (void *)(header_ser + 1); -- 2.53.0