From nobody Mon Apr 29 13:25:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1631825258; cv=none; d=zohomail.com; s=zohoarc; b=Bv+G1bQhi3fM7ZUbOif42orkLNqhTxdrKvnGQ9OfT7WVJ/OWAewoM1uYHQOTBvhZxk1hsH9DdiFhjPRKrai4+SlyjBKzzzSSHwvfeoia2SGzHXNqJYT3aq+KIbGKZRncycRGUfGeygTlkzKvdl92xyJbBNB76ULGQ/kaOttGJPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631825258; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=YzDeTbcZfXHKB/HJEswPFp2CCH6RR9OM2zggBEOIpnM=; b=gkNQsja1uj1fGWk/gpNKADbyFqPP2TzxnQBimaWnvL1+JigQNTkhmWixX77dWX8pnshXSmfUkTBTCUDRHxTDz3t9HnRe+iWxmop0ud6i+ggFe0sdlxXaHXVT9gEw/wDn99RlXSQhJHyDf2G4w1URtz2Sg/Q+IbuHVuBwBfm9q64= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 163182525865833.22247026817354; Thu, 16 Sep 2021 13:47:38 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.188707.337963 (Exim 4.92) (envelope-from ) id 1mQyHr-0004Vv-C4; Thu, 16 Sep 2021 20:47:15 +0000 Received: by outflank-mailman (output) from mailman id 188707.337963; Thu, 16 Sep 2021 20:47:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mQyHr-0004Vo-9F; Thu, 16 Sep 2021 20:47:15 +0000 Received: by outflank-mailman (input) for mailman id 188707; Thu, 16 Sep 2021 20:47:13 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mQyHp-0004Vi-HP for xen-devel@lists.xenproject.org; Thu, 16 Sep 2021 20:47:13 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 56da84a9-0238-4d8d-a0c1-a090dff96290; Thu, 16 Sep 2021 20:47:12 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id A24A26105A; Thu, 16 Sep 2021 20:47:11 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 56da84a9-0238-4d8d-a0c1-a090dff96290 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631825231; bh=hUUxl6qnTkEwYaeIJkEF9g5jwBeOS7mM8Haq/htk6Z0=; h=Date:From:To:cc:Subject:From; b=ICYUStp/U0HV9KnebF+TKWAF8X+IQSBN2WH3in68bQImOlpk/KvikyKqpeQXIei3s HpTimv0ANfWRK5z8NNqZblLs2Wiq1UhwWjQrt4ylKUofZseGmTrNVIf1D8j/bzr6aE d9EXT0PEKbakf1BtblJCAGecKzNxGHfnCZiYrO/eVAK41draXBETr6Fx6H6DdhbNQr cnxhI8z54ihJVQopl0eIzqJYQvpdwY7gFP1J4OHDWeB5IU2wm8kHG+DUzqUrM9BA/A tbdFdvTdItqNjwjFMejefr269c7FfM8eyZ4t2WFyqUEhO19lc1t9op3Aq3ICXnezMD LkYePmE74tAoQ== Date: Thu, 16 Sep 2021 13:47:11 -0700 (PDT) From: Stefano Stabellini X-X-Sender: sstabellini@sstabellini-ThinkPad-T480s To: jbeulich@suse.com cc: sstabellini@kernel.org, penny.zheng@arm.com, Bertrand.Marquis@arm.com, Wei.Chen@arm.com, xen-devel@lists.xenproject.org, julien@xen.org Subject: [PATCH] modify acquire_domstatic_pages to take an unsigned int size parameter Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1631825260320100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" acquire_domstatic_pages currently takes an unsigned long nr_mfns parameter, but actually it cannot handle anything larger than an unsigned int nr_mfns. That's because acquire_domstatic_pages is based on assign_pages which also takes an unsigned int nr parameter. So modify the nr_mfns parameter of acquire_domstatic_pages to be unsigned int. There is only one caller in xen/arch/arm/domain_build.c:allocate_static_memory. Check that the value to be passed to acquire_domstatic_pages is no larger than UINT_MAX. If it is, print an error and goto fail. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Reviewed-by: Bertrand Marquis --- Jan, I took your suggestion of moving the check closer to where the value is read from DT. At that point I also took the opportunity to change acquire_domstatic_pages to take an unsigned int parameter instead of unsigned long. diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 62ab7d0ead..d233d634c1 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -554,6 +554,12 @@ static void __init allocate_static_memory(struct domai= n *d, device_tree_get_reg(&cell, addr_cells, size_cells, &pbase, &psize); ASSERT(IS_ALIGNED(pbase, PAGE_SIZE) && IS_ALIGNED(psize, PAGE_SIZE= )); =20 + if ( PFN_DOWN(psize) > UINT_MAX ) + { + printk(XENLOG_ERR "%pd: static memory size too large: %#"PRIpa= ddr, + d, psize); + goto fail; + } smfn =3D maddr_to_mfn(pbase); res =3D acquire_domstatic_pages(d, smfn, PFN_DOWN(psize), 0); if ( res ) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index b9441cb06f..b64c07ae92 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2714,7 +2714,7 @@ static struct page_info * __init acquire_staticmem_pa= ges(mfn_t smfn, * then assign them to one specific domain #d. */ int __init acquire_domstatic_pages(struct domain *d, mfn_t smfn, - unsigned long nr_mfns, unsigned int mem= flags) + unsigned int nr_mfns, unsigned int memf= lags) { struct page_info *pg; =20 diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index dd49237e86..5db26ed477 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -89,7 +89,7 @@ bool scrub_free_pages(void); /* These functions are for static memory */ void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, bool need_scrub); -int acquire_domstatic_pages(struct domain *d, mfn_t smfn, unsigned long nr= _mfns, +int acquire_domstatic_pages(struct domain *d, mfn_t smfn, unsigned int nr_= mfns, unsigned int memflags); #endif =20