From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 B428825F984 for ; Fri, 1 May 2026 17:31:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777656696; cv=none; b=IFwobwd+N0ECIOi9X2x0LN3nrGDWJYq9s3LuuIuJAjDlK9LuOt3m/WkSsipHKl54ZHSLJy1Kzz3MoeVbrvdsX1LGrKSy7fFjInqSKCwnN3btfQUjTgIaKUemH/T0K8eavOpeIYgCO6pmLwUAdKP85iPPn2hVVtfXCr89sLthk/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777656696; c=relaxed/simple; bh=OnrW1DWYjOoentfhwT2TkBVIvw6RB2xHmcVD2F9SW9g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c+OuqR9bUiMEtR99NfP4CXL7r34ujGW7Skv18myBk/171DigFdYB6s3xyOaHSGJ8ttYFAFvgaUkRspq9AP0/kwtVvleW/q4oXKzVXUnXkbIB4gLdpnxh2Lty05P1tZk4r4TAnJn9amcq45F2ToopN6160UdVtGK2IelZ9MIGmkg= 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=CmGXMDhQ; arc=none smtp.client-ip=209.85.214.169 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="CmGXMDhQ" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2b25cf1b5f0so11910905ad.3 for ; Fri, 01 May 2026 10:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777656695; x=1778261495; 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=8CXENGFI680//+XMLD9o6Yj9f9pS4CJGNcNi4QeEBC0=; b=CmGXMDhQbi5fRCXuZY78IhEPUizhW+82BWJ3EoRnbdPBwPn3D8lZEyq4qRVbPnJqOr lbEzSMIJ0vz4fkfb5M0GA0q28iu2y47k02KgMkRUjBh5CSrA+ZsmbobXOZEuNmyvXVAx xOdX/e+lTg+RLnv8wyB1VMGfhuqTuAD6EXmJADYYMfKWeBQxROCa3L+H46LwhRG37eyD /92shpo5iY1p61Bc/d+NAY6/+bCcWkTevhe2cZ6EtN0RTsj+h30T+Kj0Zch/rqwsuu1a yZZoALiREBkmo3mwTTCxSV4yNQM8Va8RaRGhzMNiQZ38YzDYV4Vf/WnHTeJVUyr5I3y8 bnyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777656695; x=1778261495; 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=8CXENGFI680//+XMLD9o6Yj9f9pS4CJGNcNi4QeEBC0=; b=iCs3W3Po79Z6rPrkox97kdrQILgVpnsmZxVZRqUvNp4BBMn8EJwfwe45jvmvMh//tD xG0G4fVULfNhyCMNF7CvFdd9vohd6Y0q0zcAPELnTsNvk5r/u7njmTnpgwXjUEL90Apg Zw2N3DDLQFZS5JrNVlhdaLgdz0b7O1J3YJ8a783q4MiN9WlK1zLgam/AU0c26+kppuoN fuJUsvyCmbzcZqAlef8SN6ncskXmBZqZMkE2U6FVjUrGfFvclG+gGCRmJLpSF01u1s5W chMJtIGsuKup0dHmjyiLFxU9McDbxHGJC1J26Q8hidmcNPdwXxEkk8pG0MD2/Puo/eaM n1cA== X-Forwarded-Encrypted: i=1; AFNElJ/40OeGAmfBgJhEBwehGYcYYSxuUqP+nuXhNmDb6u3/mlCC6SWQO77vlifOqTe1WnrkiA0Q5ows5pTzRNA=@vger.kernel.org X-Gm-Message-State: AOJu0YxomcipY/u15oXBj+4rSsN65c+tokdsfEwkOI3E8Rl2eQHaR332 ibzb+BpEirRomFX2vKcYlOFgSabD8vDZfIeKqekTYg57sJZomO+DFDXI X-Gm-Gg: AeBDieuJPU7uRFPyVz/pQMGoP+MdeuBp/0nLB5wLmj6U3u5+w8FdZB2a51W/3p13FuL jZHMbddLtTZmMp0MHKAPfB+XSrudnhZCxYSXvtkxOAo4fk6yH6tkH0kLfbdx21KH235RM7XfdLf hrz3To4K4HQZv7qqr5lo5Z9YDE1DtX1xvgUNPnxaKmk8y9OJg3tW6QFqSeFsZ9gPeq5Unw4bg1F 1tnQolvCyWsHb6dJyy1MHrL7vB+iMxfOhs41pnHahenO9Leh+EPLM8OencVHlXbNiNPnttt9vat MLOG9sH07MwYSlOLWD5WW+LaTUr+kNBshm7wUHUyXl/PM4dKuD4qAxSBlqTaSle8yW14YxC9dml yov4br0b4lpxTzs47v7/zOo/Wpp+niAOJGg/vw/8qD+GOdrpnEsVG07ds45KMplnxbV0CJLp/Xh /iHWpay7hCyH0S8oADVj8lS2Xr6YLO9DtLj9WrwA== X-Received: by 2002:a17:903:380f:b0:2b2:9f9f:fe6b with SMTP id d9443c01a7336-2b9f2821038mr1393735ad.40.1777656695011; Fri, 01 May 2026 10:31:35 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 10:31:34 -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 3/5] liveupdate: validate restored LUO session metadata Date: Sat, 2 May 2026 01:30:51 +0800 Message-ID: <20260501173053.73116-4-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 session header, which LUO maps before reading session metadata. Check that physical range against KHO-preserved memory before calling phys_to_virt(), and abort the restore if the physical range is not covered. The session header has a count that controls how far LUO walks the serialized session array. Check that count against LUO_SESSION_MAX before deserialization, and abort the restore if the value is out of range. Signed-off-by: Cris Jacob Maamor --- kernel/liveupdate/luo_session.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/kernel/liveupdate/luo_session.c b/kernel/liveupdate/luo_session.c index a3327a28fc1f..0244c071936d 100644 --- a/kernel/liveupdate/luo_session.c +++ b/kernel/liveupdate/luo_session.c @@ -501,7 +501,18 @@ int __init luo_session_setup_incoming(void *fdt_in) } header_ser_pa = get_unaligned((u64 *)ptr); + if (!kho_is_preserved(header_ser_pa, LUO_SESSION_PGCNT)) { + pr_err("Session 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->count > LUO_SESSION_MAX) { + pr_err("Invalid session count: %llu\n", + (unsigned long long)header_ser->count); + return -EINVAL; + } luo_session_global.incoming.header_ser = header_ser; luo_session_global.incoming.ser = (void *)(header_ser + 1); @@ -515,6 +526,7 @@ int luo_session_deserialize(void) struct luo_session_header *sh = &luo_session_global.incoming; static bool is_deserialized; static int err; + u64 count; /* If has been deserialized, always return the same error code */ if (is_deserialized) @@ -524,6 +536,13 @@ int luo_session_deserialize(void) if (!sh->active) return 0; + count = sh->header_ser->count; + if (count > LUO_SESSION_MAX) { + pr_err("Invalid session count: %llu\n", + (unsigned long long)count); + return -EINVAL; + } + /* * Note on error handling: * @@ -539,7 +558,7 @@ int luo_session_deserialize(void) * userspace to detect the failure and trigger a reboot, which will * reliably reset devices and reclaim memory. */ - for (int i = 0; i < sh->header_ser->count; i++) { + for (u64 i = 0; i < count; i++) { struct luo_session *session; session = luo_session_alloc(sh->ser[i].name); @@ -606,4 +625,3 @@ int luo_session_serialize(void) return err; } - -- 2.53.0