From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 C9BFE3F4109 for ; Wed, 13 May 2026 13:34:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778679294; cv=none; b=qEWwds2I+dPfCUhWVbHh4wPkA0u1b04dYqF30GXbj7V8B6ggMItZT7Ze//Vh268XNpZ0RVauniIKoCbdmm7WQWblHlKpMPcd3En5EJXHYJ9ER4woMTXiyCqN/KU7Saorv/Mrt0eS19kvPu54CYDoORJopRJzb0ExFx8pWvkGd+w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778679294; c=relaxed/simple; bh=xSGiGUyd7WdFFROHx3hnAyd4nrUNDZMnp1UdOVJOs5Q=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=APNnMNTtEZvQP00IaADY35vCTO+LI6dNz7qE7Qcwo1q1Qmg52+NN4VMNKy/BpQzx23Rk26b8+RefCNb7NPkd3hzIb95kEQJ0x24Hso1OcZ1XU1HzHgRQHDkWZhkVHon0x7FzrwHxhyZ9Pnjz5YM9KvuJMssnZwUSQfG4E4tbH0Q= 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=VxonTgUw; arc=none smtp.client-ip=209.85.128.47 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="VxonTgUw" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4891b4934ffso925e9.0 for ; Wed, 13 May 2026 06:34:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778679291; x=1779284091; 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=jGeQr4vZaey6OdXuMe/F8YfUkluAsGc9AieNXA6tGdE=; b=VxonTgUw1+NH5Valdq08aN1ON6KgapWoJofeqGRQ2oZ2qcVAD5I7P76OLB9NERO4fp 6A6He+ywaMEs4/2MUSJIvofW66cn+9G2qzH+1K4Osw3ZbPxazUKwuUSPiUkVK9vndPQ4 Qjz/ND/gL6Gl2Kqhv79f1XCZpudlYNMyMALqfdi7RQrrr2qyTZfS/Y3RsPqKw6fccV8H gqN8jSWc7V8gDz0sI0u8f6qkUsM0CuFAJFak+a5SOQxFNQ4NTk2PZrB8RmyqeQ7C3GTU dSo3BkPI5Hmd2tOREKjXu+8QJhrx1AcGJCTP7OZpxS3u+cvmXTUt+sW5Yl6ILBo1qs3/ oppA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778679291; x=1779284091; 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=jGeQr4vZaey6OdXuMe/F8YfUkluAsGc9AieNXA6tGdE=; b=Y85dxzkAiMP/E10cdmcvrNMVIjBl/bfogK7RI3ONT7uRN4MKNAIWlVUW7QBmKV5HT2 fz8mGm82iMitqDbMO7yRb+ivuABRJB4N1BKbRuxa8KTEbFaBOGuCoimsOsDSaAatFAFP L6cl+h2klk31rTw076lgqHknLcg6LUPmlKWNDvr5u1guJJnCed0JN1ci6NPcaimhA1sh UAx9DCBoKGl0KMiVP01IiugxOYlOEjreJRZPqsYVszv2/FwpDrwjiFlbmkJiqhMCQRyf Ms+dB92+HXVp4RR87lFrcK2v2C/HRl//Qh72a/8HIcoeIVCpw7ejf2Gp96qo5rkTGu5U vqFA== X-Forwarded-Encrypted: i=1; AFNElJ/Kmo59Zl1NZmK5NOzKPY/Sg/g9BONYsYmwi9fLYzsocqZ+EolQCmf0WPiacqEf/lZfKsL52N0Bb+Tp8vM=@vger.kernel.org X-Gm-Message-State: AOJu0YzXPFWIdS1hdjQy7kcGoW4RI5ppHL46MYYhqS3PXEfQn3O938ne 9nnQG0vliY7kmTwW21GPZ5643GeZ+JfLOJoFDo2H1Rm39VhZXnvHEuGN5dRwfbijSw== X-Gm-Gg: Acq92OHKuPW8qdr9YjWPk28ZKQwVnq3950pcIKp1koPx8wU/2uGXvlDYpye6c2yySpW WUZpuwRcOk6Mp2zKAv5kr38i2+R+jkJ+Y+xdpfAfdvc64sqjajR0nIGqvbHhcyzkIDMw3EUSj4O TmiRKEguAVDKCW3FbVyZ6T4BMxPlFtrlQMX4NhEgk8ar4dQf01BGc7LKzM430/T4q5WV/ds7BHf yQmXeg3mB+92T1G+uZ8hJzDxCY22Z1eHiRohbx/d2tfNWZbD1aeo2lupkHzZcPKC3oW03r4ajJ8 sXor/q03VyNtdfNGPkGn12GCQxt7MEKuMzNFW7i5S282STc16disVMI5M0malBkvEYpGreoSigK pH7A0he+5cVQ+Smb2NdCMOuv5jhXdvEIyBh9b6UzYCwSbxQosHD+AIwmvvAvOjRK9HUp6kqi3mm 1DC+gNQW0ZLa+qVHrGxTnvI/nn8OFs0KWZQbGMAwmQrNY8sanjysodcdSQkpcfMPYaHtI= X-Received: by 2002:a7b:c455:0:b0:48a:5d95:d33e with SMTP id 5b1f17b1804b1-48fc9148926mr763185e9.6.1778679290836; Wed, 13 May 2026 06:34:50 -0700 (PDT) Received: from google.com (8.181.38.34.bc.googleusercontent.com. [34.38.181.8]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fce065732sm43837465e9.6.2026.05.13.06.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2026 06:34:48 -0700 (PDT) Date: Wed, 13 May 2026 13:34:42 +0000 From: Mostafa Saleh To: Sebastian Ene Cc: catalin.marinas@arm.com, maz@kernel.org, oupton@kernel.org, sudeep.holla@kernel.org, will@kernel.org, joey.gouly@arm.com, korneld@google.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, android-kvm@google.com, mrigendra.chaubey@gmail.com, perlarsen@google.com, suzuki.poulose@arm.com, vdonnefort@google.com, yuzenghui@huawei.com Subject: Re: [PATCH v3 1/2] firmware: arm_ffa: Fix Endpoint Memory Access Descriptor offset calculation Message-ID: References: <20260512124442.1899107-1-sebastianene@google.com> <20260512124442.1899107-2-sebastianene@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: <20260512124442.1899107-2-sebastianene@google.com> On Tue, May 12, 2026 at 12:44:41PM +0000, Sebastian Ene wrote: > Use the descriptor's `ep_mem_offset` to calculate the start of the endpoint > memory access array and to comply with the FF-A spec instead of defaulting > to `sizeof(struct ffa_mem_region)`. > This requires moving `ffa_mem_region_additional_setup()` earlier in the setup > flow. > Also, add sanity checks to ensure the calculated descriptor offsets do not > exceed `max_fragsize`. > > Signed-off-by: Sebastian Ene > --- > drivers/firmware/arm_ffa/driver.c | 14 ++++++++++---- > include/linux/arm_ffa.h | 2 +- > 2 files changed, 11 insertions(+), 5 deletions(-) > > diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c > index eb2782848283..56b166290b24 100644 > --- a/drivers/firmware/arm_ffa/driver.c > +++ b/drivers/firmware/arm_ffa/driver.c > @@ -685,18 +685,25 @@ ffa_setup_and_transmit(u32 func_id, void *buffer, u32 max_fragsize, > struct ffa_composite_mem_region *composite; > struct ffa_mem_region_addr_range *constituents; > struct ffa_mem_region_attributes *ep_mem_access; > - u32 idx, frag_len, length, buf_sz = 0, num_entries = sg_nents(args->sg); > + u32 idx, frag_len, length, buf_sz = 0, num_entries = sg_nents(args->sg), ep_offset; > > mem_region->tag = args->tag; > mem_region->flags = args->flags; > mem_region->sender_id = drv_info->vm_id; > mem_region->attributes = ffa_memory_attributes_get(func_id); > + > + ffa_mem_region_additional_setup(drv_info->version, mem_region); > composite_offset = ffa_mem_desc_offset(buffer, args->nattrs, > drv_info->version); > + if (composite_offset > max_fragsize - sizeof(struct ffa_composite_mem_region)) > + return -ENXIO; nit: This driver seems to use sizeof() with variable name rather than type (except for one place) so it may be good to keep that. > > for (idx = 0; idx < args->nattrs; idx++) { > - ep_mem_access = buffer + > - ffa_mem_desc_offset(buffer, idx, drv_info->version); > + ep_offset = ffa_mem_desc_offset(buffer, idx, drv_info->version); > + if (ep_offset > max_fragsize - sizeof(struct ffa_mem_region_attributes)) > + return -ENXIO; > + > + ep_mem_access = buffer + ep_offset; > ep_mem_access->receiver = args->attrs[idx].receiver; > ep_mem_access->attrs = args->attrs[idx].attrs; > ep_mem_access->composite_off = composite_offset; > @@ -708,7 +715,6 @@ ffa_setup_and_transmit(u32 func_id, void *buffer, u32 max_fragsize, > } > mem_region->handle = 0; > mem_region->ep_count = args->nattrs; > - ffa_mem_region_additional_setup(drv_info->version, mem_region); > > composite = buffer + composite_offset; > composite->total_pg_cnt = ffa_get_num_pages_sg(args->sg); > diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h > index 81e603839c4a..62d67dae8b70 100644 > --- a/include/linux/arm_ffa.h > +++ b/include/linux/arm_ffa.h > @@ -445,7 +445,7 @@ ffa_mem_desc_offset(struct ffa_mem_region *buf, int count, u32 ffa_version) > if (!FFA_MEM_REGION_HAS_EP_MEM_OFFSET(ffa_version)) > offset += offsetof(struct ffa_mem_region, ep_mem_offset); > else > - offset += sizeof(struct ffa_mem_region); > + offset += buf->ep_mem_offset; Does it make sense to also set buf->ep_mem_offset for the other case in ffa_mem_region_additional_setup() and then add this unconditionally here? Thanks, Mostafa > > return offset; > } > -- > 2.54.0.563.g4f69b47b94-goog >