From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 3609137188B for ; Fri, 12 Jun 2026 16:08:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781280484; cv=none; b=Zju0AP/WVKcOU4ouW7S58ol2L7JtpFABnf5shUCPnrbx0LMZNljB/U55B0FmjI5z98aGjoze9fFqmlGcnZcpCOqGEPVCcOjFtj7/vbHAnyYLLJMMpyMWZzgs30OVxmRnVoe+hOcausnc0+sakOEoh4CmdqZAmAQWqs0xdApsYVI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781280484; c=relaxed/simple; bh=+Vco8Dmdfgiaph1JQEXf8hi7Xz17MRwEMZYFFDnZWUA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=dKYujLrgy/wjJTHH8+s5MpZI7gtPeiQvuYfAVbcDlfszeQd81U8kDmi/P7E7u/x3ofgCx+8Duj48cj3Vpl+Tlih6az89kOLXxi8C4XGGgtN+il4Hley3HtYBaD/0hZVYLPjB7ABWrSyqY9y/y6j1yOhbzAqImKzVZpBMtqqAtw0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=S7N/j4kp; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="S7N/j4kp" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-490bd64ca95so79355e9.0 for ; Fri, 12 Jun 2026 09:08:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781280481; x=1781885281; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=eLOF6fP/rRJNscoDrzMxzXOITjjOmIqhXSUh0KfqXwE=; b=S7N/j4kpsGMT0lYoR5SUxksUi+waPwY8zGeKfUy2yOgWzgTQmZeZfd9OG/FhQiemDH f6Q2KlJgq37qiRDBCSMVpxkmcKN3hc0JgthGue6lID4q1lr4VAz2ymz040GJERYSgju8 8dP6009dqZONCZ3qWya0FaUPyXQR0uLBxMQZoEZoI6ur0LZtVQ1squXVfzx9gAtbNjhA qSpbyLfNkZ6IxiriobmPvVlYGfqzcpx0sbA3emIjTsPrysqWyeHBvpQOdy8hc7PE3fvb tPzylBB5L9dOCnKNZzrKxUbFjnfjc3dfFIXaMMNA33vKgAcW2Ys2qp7JxXJ3qWwGGtXY l7kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781280481; x=1781885281; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eLOF6fP/rRJNscoDrzMxzXOITjjOmIqhXSUh0KfqXwE=; b=k5QkeioRDAtPEZ1HQhADz2g6PocH+8YcyJlHmW2R0L5BDOu+lovGlB9nBz6VXq8JeX v2Q5nKA1dBA2RB3bA3AKIQXiSJuXeH2AGe+xurxQsg9xloxi4aNb6KCIPBu2TdhMPCm9 5pCeV/qQEwOBZB9YxyF4ygIdKn5gzmkNml80p1TtoC83Xf9M6BymqeymoZmT62vF2V0+ YG3JqsIUsXivf0uygRxBbQXUJmOUaDapHlW3Fd24QTshKyxgH3Abq/g0kHznB4s6SLaK oMPgpHqTqChr+gQeWyT7lcHaRSbJvRMIVaJuDQg9ebaq15r2ZHf5fXnklezcFZ1T0SxA awQg== X-Forwarded-Encrypted: i=1; AFNElJ8CCz+yKItcSXSd84IFqQcfzMKtLXd+IcEIyZKauz98LSp+OFxNB84x6Oz/ExJfWTj4XBs2WckSoZufie8=@vger.kernel.org X-Gm-Message-State: AOJu0YwrosIWXm4vUv7o4qKExyqLBwtIz0SuEFQJkNw6PNCfXWypNdYm uSQBtbytEP15MFOm3cRQkG4teO4CeLWflshAXBy846OH9UxyhOLZNjTxoLuaquc+1g== X-Gm-Gg: Acq92OEG3UEdDgqSeXeNSemQaqdtGN2P3EteNzLhhlMmQvEmC0yhch7BlzWahdS+R7Q qhwTZ6ahQc7nW7XUGNwCMs9J7GQ9E2qSpj+fIe1Fds+vMH21a3P+QFgWIfD0dzKpW+QY6/JABcx ymlSqVMTEw9UIQRQ1Tsln1FR3tUK0D8Js7AYxPpCkv+GCS+ouFD09sSJOGsdDjCjUbP3ySWxRSY KGK+Yl+Flb/vAlMjq3mREofWnQHvqM4uUKufHgajGFDzDXp3H4wm81IP55rUWhBT1NdwByJTztF /FTwasIcqixlAXliUerCPEWf8Rntl/T20EIEdHtkva7YiVNHlRF/8AbyJfc4NLxG8kcbXhwcyO6 d2tcgaNf3k+89OPKV8JZVJGDrqiV56KOCwHW5eJQx7+u9FVmJdpCW/YrOzNyf9u/Z4zpgR7Dxv9 oT61QgyJH8bKdTT3qX8VIunsD95SOPlSpI+4TmPjvjpIXxksekLKvBoaL+airwN2mvuMBc6Q== X-Received: by 2002:a05:600d:6445:20b0:490:c2b6:de6b with SMTP id 5b1f17b1804b1-490ea5da36fmr1068545e9.12.1781280481013; Fri, 12 Jun 2026 09:08:01 -0700 (PDT) Received: from google.com (143.11.148.146.bc.googleusercontent.com. [146.148.11.143]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f26f1cdsm7389953f8f.11.2026.06.12.09.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 09:08:00 -0700 (PDT) Date: Fri, 12 Jun 2026 16:07:56 +0000 From: Sebastian Ene To: Mostafa Saleh Cc: op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, maz@kernel.org, oupton@kernel.org, joey.gouly@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, jens.wiklander@linaro.org, sumit.garg@kernel.org, vdonnefort@google.com, sudeep.holla@kernel.org Subject: Re: [PATCH v6 6/6] KVM: arm64: Ensure FFA ranges are page aligned Message-ID: References: <20260527150236.1978655-1-smostafa@google.com> <20260527150236.1978655-7-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260527150236.1978655-7-smostafa@google.com> On Wed, May 27, 2026 at 03:02:36PM +0000, Mostafa Saleh wrote: Hi Mostafa, > At the moment we only check that the size of the range is page > aligned, and truncate the address to the page boundary. > This make an assumption that TZ will do the same. > > However, it might decide to use the extra offset of the neighbour > page at the end, which is valid under FFA if NS is using larger > page size. > > Harden this check by also checking that the base address is aligned > and reject it otherwise. > > Fixes: 436090001776 ("KVM: arm64: Handle FFA_MEM_SHARE calls from the host") > Signed-off-by: Mostafa Saleh > --- > arch/arm64/kvm/hyp/nvhe/ffa.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c > index a12e01883314..daf0e328c847 100644 > --- a/arch/arm64/kvm/hyp/nvhe/ffa.c > +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c > @@ -352,7 +352,7 @@ static u32 __ffa_host_share_ranges(struct ffa_mem_region_addr_range *ranges, > u64 sz = (u64)range->pg_cnt * FFA_PAGE_SIZE; > u64 pfn = hyp_phys_to_pfn(range->address); > > - if (!PAGE_ALIGNED(sz)) > + if (!PAGE_ALIGNED(sz | range->address)) > break; > Should we do the pfn assignment after the check ? > if (__pkvm_host_share_ffa(pfn, sz / PAGE_SIZE)) > @@ -372,7 +372,7 @@ static u32 __ffa_host_unshare_ranges(struct ffa_mem_region_addr_range *ranges, > u64 sz = (u64)range->pg_cnt * FFA_PAGE_SIZE; > u64 pfn = hyp_phys_to_pfn(range->address); > > - if (!PAGE_ALIGNED(sz)) > + if (!PAGE_ALIGNED(sz | range->address)) > break; > The same here > if (__pkvm_host_unshare_ffa(pfn, sz / PAGE_SIZE)) > -- > 2.54.0.746.g67dd491aae-goog > Thanks, Sebastian