From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8F6D1EA91; Tue, 27 May 2025 17:02:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365371; cv=none; b=hEkYtXEpqStZ7JO6uAK4qMbHPZazeB9UrFx/yQhp+T6pEnUfPk5r0Tth8o7sRB+t3BCycU7xNwvSSO4LQu9rPceQKHHNx0k/JGhbnbXhw7e0PTOMMKu179OMNDJgofY+x/ulrC2PU0CKRvpXhFzTl86BwA2r1EuVPhXkFMHtlao= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365371; c=relaxed/simple; bh=vkbRXP09So35AblRqwBn6Gqshp7RfoHQRYMb+WoXkwY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GLXd5obPSdlsYSYVuyEK61vkJ67NB1/HlzUz2WS25LA2W9BvMngjg9/qata7SWsJTS4YxVh97WQ4c0TUWRaj9jl/jszgs435kB/8lVtw/RK2E3OrPXLjhqs1E8JmFKTXa4dGhqJGin12Nbwj96rAT5XBkqKJTN7MRX0gkYoHrsw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=iXTZOM0K; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="iXTZOM0K" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55A5FC4CEE9; Tue, 27 May 2025 17:02:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748365370; bh=vkbRXP09So35AblRqwBn6Gqshp7RfoHQRYMb+WoXkwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iXTZOM0KXZoyKHSBh1UtNw0hDHXNMKjGIj3SWT2XKC7GM60DBELxw4H4gEGerAPgh dvn6kI4qoDh3bhFeeIvXfyN+wOGvIF8LBDcdGYZ0AknpRlc8jwB0eJYmDpE6Z1R2mS ktgANQaTmg6WgPbrOUacemwb3YSLOJJB9BYp+aPI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Viresh Kumar , Sudeep Holla , Sasha Levin Subject: [PATCH 6.12 355/626] firmware: arm_ffa: Reject higher major version as incompatible Date: Tue, 27 May 2025 18:24:08 +0200 Message-ID: <20250527162459.440118605@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sudeep Holla [ Upstream commit efff6a7f16b34fd902f342b58bd8bafc2d6f2fd1 ] When the firmware compatibility was handled previously in the commit 8e3f9da608f1 ("firmware: arm_ffa: Handle compatibility with different firmware versions"), we only addressed firmware versions that have higher minor versions compared to the driver version which is should be considered compatible unless the firmware returns NOT_SUPPORTED. However, if the firmware reports higher major version than the driver supported, we need to reject it. If the firmware can work in a compatible mode with the driver requested version, it must return the same major version as requested. Tested-by: Viresh Kumar Message-Id: <20250217-ffa_updates-v3-12-bd1d9de615e7@arm.com> Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/firmware/arm_ffa/driver.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index dce448687e28e..8dc8654f9f4b2 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -150,6 +150,14 @@ static int ffa_version_check(u32 *version) return -EOPNOTSUPP; } + if (FFA_MAJOR_VERSION(ver.a0) > FFA_MAJOR_VERSION(FFA_DRIVER_VERSION)) { + pr_err("Incompatible v%d.%d! Latest supported v%d.%d\n", + FFA_MAJOR_VERSION(ver.a0), FFA_MINOR_VERSION(ver.a0), + FFA_MAJOR_VERSION(FFA_DRIVER_VERSION), + FFA_MINOR_VERSION(FFA_DRIVER_VERSION)); + return -EINVAL; + } + if (ver.a0 < FFA_MIN_VERSION) { pr_err("Incompatible v%d.%d! Earliest supported v%d.%d\n", FFA_MAJOR_VERSION(ver.a0), FFA_MINOR_VERSION(ver.a0), -- 2.39.5