From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 606EB3128D5 for ; Tue, 26 May 2026 15:19:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779808795; cv=none; b=Ep/ovguac24B8FfK5mMe9RLasNpMZVSCnBWmWZaG71JSsRAyaaiCQKdmFiGKVFy6+sRZwBFfx7LQFQeSMyS3FJ6LUH6RjiNJItz65tW+SOSbmD83Xf8OqlNnpZ1gJCwCZnt0QRkZu5YGAy7NNfu0tKTjzHPVEguJ0v5yTqDQSR4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779808795; c=relaxed/simple; bh=cWAWGazl9y0NCQE6boUFtmipRD653SY/f3mBGb2AlJ8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BS7Zrdrc1lyDDX3lswRiHWItineEBCgmPc+tpQtzhx0dZxyKeTrIrfYXcY3JZgyvyk5m4l4uR2WBKP7/+4kQt7CpMkL+z1KYZX1mAUWKQ26A2xM8TOYm2vPjWiaGGevtyY1x7wdWzDULDcv3T06pMy3tVM+3le2TVPOAUllewr8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=lj7niNvA; arc=none smtp.client-ip=209.85.128.73 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=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="lj7niNvA" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-490402ae2c1so45516885e9.0 for ; Tue, 26 May 2026 08:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779808792; x=1780413592; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=e46ed4u5Cv0I3gq+GXl599KXwFIbkYlwQRCW4+ScRKU=; b=lj7niNvAeR0stzP+93B+HUjVlBM3Z2uFtBhgemg69FTWqomFhQ48rxLfQ+sC7j3gXQ lm0kMsA3CcRuPc1FsxUwbeVyxlX2Lx3MFKV+lGG9x6CV5DWM1XuKfrtkCV+Z+wPavBgF ZdsfIT3xONHGsLeaYfu6LrqCFOxlfTn0lkt1IRTqYrFp90hZRJMmJCChzP5X7+YzHa1G e7jCT8wU97ZeGDilHlO98RmBKdQVUkVN/xeDc68s54An/L7lgzxPZxlOfipdD4muXAM7 P67p7y6t5JSZHPZXk94YzlGTxtajdSlH4c7kYpLcV2VAN5lFDFnJ7rx+3TEkLzusAFOg Ca1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779808792; x=1780413592; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=e46ed4u5Cv0I3gq+GXl599KXwFIbkYlwQRCW4+ScRKU=; b=lNR1JSOx/nhhZTvWnYpWHDg3YmnpUK2qAzsqnIp6OFuSSGFIA+HK+r6VDUtsUIJbku ZXlPbq6ucHi4OHOxT0M8fG95Jn24NKpMEgkrK+exhNmOfxphOqtCHiixMXmT2qA/pScX rHykSDVi8yViHDjKYZnG5fknkk6kbK9S1JIBUpCo48sXrWCaU2ocQqRG3L1aXB4jRG8b CuTz2k/aozaMyLRyIriy/73E76rnYw/KodEnL/jMFzs6XsPywQGjKXdWxDSe97sCdV94 wV4F4mCRODpgydkrzY+PP97NCuci7OfNU+q1njmlxlk5DLojMWWeRdHmJJWDtPSt3JqL 0WVw== X-Forwarded-Encrypted: i=1; AFNElJ8W16H/lYMtt8garPTgMjTAFrW4ITg4ZS7CMxZyzV3q4siQiwgkfGJNUa6n7D8YCWK/gQRCFa41x+tJPm4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2GWT3tgsUNRoNzi2jce4uNK1hFpNkXyj9Of4gaWe4ZZ8d9w+Z sC/EEPqyupQuPqB7Y+EB1ReVhD+vS70WXd+p0rYoUQEyFzW7cMgaDqqFbZTAMlkxJv4bXfOpuB2 eJmJ8+40GPqlfbA== X-Received: from wrpj7.prod.google.com ([2002:adf:f547:0:b0:45e:75ad:a480]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:5681:b0:486:fcc7:6811 with SMTP id 5b1f17b1804b1-49035f53c64mr252846105e9.10.1779808791592; Tue, 26 May 2026 08:19:51 -0700 (PDT) Date: Tue, 26 May 2026 15:19:33 +0000 In-Reply-To: <20260526151934.3783707-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260526151934.3783707-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.746.g67dd491aae-goog Message-ID: <20260526151934.3783707-6-smostafa@google.com> Subject: [PATCH v5 5/6] KVM: arm64: Validate the offset to the mem access descriptor From: Mostafa Saleh To: op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: 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, sebastianene@google.com, vdonnefort@google.com, sudeep.holla@kernel.org, Mostafa Saleh Content-Type: text/plain; charset="UTF-8" From: Sebastian Ene Prevent the pKVM hypervisor from making assumptions that the endpoint memory access descriptor (EMAD) comes right after the FF-A memory region header. Prior to FF-A version 1.1 the header of the memory region didn't contain an offset to the endpoint memory access descriptor. The layout of a memory transaction looks like this from 1.1 onward: Type | Field name | Offset [ Header | ffa_mem_region | 0 EMAD 1 | ffa_mem_region_attributes) | ffa_mem_region.ep_mem_offset ] Verify that the offset to the first endpoint memory access descriptor is within the mailbox buffer bounds. Also, fix one hardcoded sizeof(struct ffa_mem_region_attributes) that should be replaced ffa_emad_size_get() for compatibility with FFA v1.0. [@Mostafa, Add missing call to ffa_rx_release() and use fraglen as the max buffer size as it is the only intialised part] Signed-off-by: Sebastian Ene Signed-off-by: Mostafa Saleh --- arch/arm64/kvm/hyp/nvhe/ffa.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index b6cf9ad82e12..79de358333e4 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -479,7 +479,7 @@ static void __do_ffa_mem_xfer(const u64 func_id, struct ffa_mem_region_attributes *ep_mem_access; struct ffa_composite_mem_region *reg; struct ffa_mem_region *buf; - u32 offset, nr_ranges, checked_offset; + u32 offset, nr_ranges, checked_offset, em_mem_access_off; int ret = 0; if (addr_mbz || npages_mbz || fraglen > len || @@ -489,7 +489,7 @@ static void __do_ffa_mem_xfer(const u64 func_id, } if (fraglen < sizeof(struct ffa_mem_region) + - sizeof(struct ffa_mem_region_attributes)) { + ffa_emad_size_get(hyp_ffa_version)) { ret = FFA_RET_INVALID_PARAMETERS; goto out; } @@ -508,8 +508,13 @@ static void __do_ffa_mem_xfer(const u64 func_id, buf = hyp_buffers.tx; memcpy(buf, host_buffers.tx, fraglen); - ep_mem_access = (void *)buf + - ffa_mem_desc_offset(buf, 0, hyp_ffa_version); + em_mem_access_off = ffa_mem_desc_offset(buf, 0, hyp_ffa_version); + if ((u64)em_mem_access_off + ffa_emad_size_get(hyp_ffa_version) > fraglen) { + ret = FFA_RET_INVALID_PARAMETERS; + goto out_unlock; + } + + ep_mem_access = (void *)buf + em_mem_access_off; offset = ep_mem_access->composite_off; if (!offset || buf->ep_count != 1 || buf->sender_id != HOST_FFA_ID) { ret = FFA_RET_INVALID_PARAMETERS; @@ -576,7 +581,7 @@ static void do_ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, DECLARE_REG(u32, flags, ctxt, 3); struct ffa_mem_region_attributes *ep_mem_access; struct ffa_composite_mem_region *reg; - u32 offset, len, fraglen, fragoff; + u32 offset, len, fraglen, fragoff, em_mem_access_off; struct ffa_mem_region *buf; int ret = 0; u64 handle; @@ -599,8 +604,14 @@ static void do_ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, len = res->a1; fraglen = res->a2; - ep_mem_access = (void *)buf + - ffa_mem_desc_offset(buf, 0, hyp_ffa_version); + em_mem_access_off = ffa_mem_desc_offset(buf, 0, hyp_ffa_version); + if ((u64)em_mem_access_off + ffa_emad_size_get(hyp_ffa_version) > fraglen) { + ret = FFA_RET_INVALID_PARAMETERS; + ffa_rx_release(res); + goto out_unlock; + } + + ep_mem_access = (void *)buf + em_mem_access_off; offset = ep_mem_access->composite_off; /* * We can trust the SPMD to get this right, but let's at least -- 2.54.0.746.g67dd491aae-goog