From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 B11A83F39C8 for ; Thu, 16 Jul 2026 08:37:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784191064; cv=none; b=VrfCaf5H8DgZx3tIIetZUWLPr/U2Rs0kmhy4Ftqp+Cm9h+VV1zTJF19PN88JvNEp+Efp/8TEpHyPHV9T8beeCnSsAkLEoGBoIbmDaf+azkmC5n2g7RA9IDY1aZcVgyQPXHGvFs6vrX2ffTJ14powO+B3nu0pZWPmOVBW/krqEK8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784191064; c=relaxed/simple; bh=NCMb0CAxTVCcPUPM3ObrHiyfUVdP5M/LsUrX5gE5HoU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MKu/JdhO8a5ZXeIVL7CeAupHIye/IFyMyNlJjFAueP1rBBkZLmUnSIn3j/LG54Js+4NlIFdufDKha7cGEGsLi/7qvkqzxcIwzC8nhB/+D3tM1JfGIkPbgZ2tyHq8idV32QYnJKMm0kIjtryXWzKHo8F4y1yYikm+f55/xyg6iY8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=hlHEw8Ei; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GRlQY5C4; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="hlHEw8Ei"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GRlQY5C4" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66G7DOMC2102701 for ; Thu, 16 Jul 2026 08:37:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=Vuwauky0S7U MDJ8ZgbId8W1CiyJ3qKKODKvrCHME6gg=; b=hlHEw8EiO6Te84IfBJxuj5IYC6F 3pS+lBJMkXDizUjRZZu/bjN3NRtdVIB6Cqx0+sUn67tISa4gyLrExoy5MgOFeRJU PJ6u5hMQfLDrCe/JMFrKuRx+CB3IPY/MuaqJkOdUH79fjCE2QD5MeWjwVbF1E3L0 01kRgNTPa+2KTVMzC3xvYy5ihDNuW4gJNpsC6Zwru6C7wIVZeVPE/YJ0Htws660/ GWmzlfUQm9AiUb2QrL1hpvgI1E87wzx5F4HVOg18/T8myfn5LSd01Qshev1bnZq6 Mhk0WuLyQv8pzB+vz1HEGksXVO3vu6ogSSTc2X8TMCVnPDJI7bPYmOtyZdg== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fen4w9f1a-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 08:37:41 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92d1cae5939so887431285a.0 for ; Thu, 16 Jul 2026 01:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784191061; x=1784795861; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Vuwauky0S7UMDJ8ZgbId8W1CiyJ3qKKODKvrCHME6gg=; b=GRlQY5C4luHuMuKRlHHDG8dT9O5msCUochp3oXddNMjfHsgOvcT/J/l+pvdyt7oc41 9lLJDNcxKvx+IHa8Of9ADZhGQtTpuau9CUS2Wzk7ZIdUo6sIf/RU0AGOOp6s+i2K5B8c rhqDKuuijujCaGluatfOWZLQ2K3QlD3NeQyYJ+L381QC12+t7Ip/jxp07MWo4drKKWul Sl3j3iCJ56NMnbdQcJWXR3cmO1D/ucaQsrBiNK1nYVZuo2PAZw3raUI2hjhkfDaw7tPm mj5ohgu4xxXcJEa73UCMwn8zLEeFy4tDZNDvIYNq50aj199BX5rKHCpkydfrBSI+dzIg sUqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784191061; x=1784795861; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Vuwauky0S7UMDJ8ZgbId8W1CiyJ3qKKODKvrCHME6gg=; b=MlI8K4l+PiswwAU766l6hNkGnM5t7l/pLANdhr7PahQrQCZSIc+keCP4ppB7dGGYPe G74DaR6TEvASOmQnlkp5isINJCu8Nc9Q9+M30eZkV0RiSlkfb+U3Thf6WHMtqZU5fOJ/ gLYaOFx9Vqwd88a/WGqgGXthsvq9mZ7bH/gMgYT1P7s5QC0AykrGB23ec032Pg1DV7yy lJicnP41EbuOnWSreCFzGAOtGT1I5qxIsyyfGgi8UOEXtGqx+dSrdva8iDDGdOiFyP3g DnK9yz8+duC4s2ms4AP7UIlG7Z4zsi7DIPybmwzTFFg7bTnVi/y7D+k1RrPRoWvokiqJ 8rmA== X-Forwarded-Encrypted: i=1; AHgh+RobJOZCoMvokBYlfa6ayVj2p7E8Hu1bCUU9LOfqqfpEjh3ZDkxeyajj+0bLxNc2HbZEMmmwlEdunacJJRI=@vger.kernel.org X-Gm-Message-State: AOJu0YyYLVvWOQ1l36IRUAeLGTr3TJvzY3nOjxbqShKvuKqiv7FEI3c8 sNyJ75D0UUULGqMwMpoWDelLOZyp+QGRAQpbnWhgyFkd6KkxBJg2I7mewWKVpJUu9gDofJaa6bp a5dh9UKR7lkpzfMNfvQ/Hh3R9sXOA6j5na5dfZnP31zu55TGIDmihXgDJDnaBB+6Hr2A= X-Gm-Gg: AfdE7ckrHpwzD9B2oykZXAYMY3zhHg0jFxUowqOv+7UAA8due+rRLewK8ttVFNzpYV6 xrAs7s4qOQthAGkv9a3au5xTrKbzRFVsiO2yoSmMutNKlVWb2Q1qjI1dEa0d2TvRZWTX4Vh6MHX YmAh8Y7lqJpS6kYUQSb/hck4ooLsytq+j+7wC2Xa2U/7EIh50yrHcfZUNlHFuOK0p3Gxkdv33q5 gfd1KX/cQ7ZZZ4o5RmMe9W8PlbkRoLoY3RdFX2Q1WVm+NiakvAh/sdVYzFSllvR53SuWCXuftwP DF0yX06e73UynO0PfHAtV/bU6gn4s2ab5VpzVjvmIZTDNXgC9SZJ5RTTXWnPrw50raWGD08/GMO mGWUxxbTd5vt4aE6ic5dki3FX9rnfXKVTnScjYnD6GtY00mNuxTE= X-Received: by 2002:a05:622a:4185:b0:517:8470:2d2d with SMTP id d75a77b69052e-51e4237cd58mr115608661cf.29.1784191060671; Thu, 16 Jul 2026 01:37:40 -0700 (PDT) X-Received: by 2002:a05:622a:4185:b0:517:8470:2d2d with SMTP id d75a77b69052e-51e4237cd58mr115608401cf.29.1784191060259; Thu, 16 Jul 2026 01:37:40 -0700 (PDT) Received: from trex (182.red-79-144-196.dynamicip.rima-tde.net. [79.144.196.182]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49541e94e7asm43614295e9.12.2026.07.16.01.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 01:37:39 -0700 (PDT) From: Jorge Ramirez-Ortiz To: jorge.ramirez@oss.qualcomm.com, alim.akhtar@samsung.com, avri.altman@wdc.com, bvanassche@acm.org, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com, beanhuo@micron.com, can.guo@oss.qualcomm.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org, jenswi@kernel.org, sumit.garg@oss.qualcomm.com Subject: [PATCH v1 2/2] ufs: rpmb: use a fixed-length RPMB dev_id Date: Thu, 16 Jul 2026 10:37:20 +0200 Message-ID: <20260716083728.2226422-3-jorge.ramirez@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260716083728.2226422-1-jorge.ramirez@oss.qualcomm.com> References: <20260716083728.2226422-1-jorge.ramirez@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=PsejqQM3 c=1 sm=1 tr=0 ts=6a589855 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=2lELrtOEK2EaG96G7mOeag==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=OSdCpuDsIsRB4DqEP3sA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-GUID: ud6BEndwhYjXrZ3qaLGzLcL3rAQp4aoR X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDA4NyBTYWx0ZWRfXxdNWJ0BRJyI6 y/yVwz6FiKV59sFvOD8eUyJ5hzjpRR7XjjfoC8aae9BYqqv4Uqpz4XoBv7ctQTxayoUlg6Qozqd 3R7mUov65cnw8iBD2x33tVWLTeKjCuQ= X-Proofpoint-ORIG-GUID: ud6BEndwhYjXrZ3qaLGzLcL3rAQp4aoR X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDA4NyBTYWx0ZWRfX4VzN9g1AQJap sBtD6pu0nFKTorwjxOqVIhZRlgNWYKK6Oy4bzs3dvF0emxd87Nx9EU2EUcWbrRlOtDHQ73ZcQ5j O3lsZ1hPSszCHnfZwUy0ga8PB9ELGKAnyqBxeJGBB3GSxBaNj8+HN7kuD1X5455AYQ171gBrPfw htLg2xdQQCoKdiN2T8YQfRoEzHrl6a27+yRduJLisv1Na3gzxIpizxg9EnOErhWMr/UUEs5l7Ee jNsaAMnivQmdCNI3EtbxhQddD9u/fNwqy6TQk6j2Id/3RjKzn9I8HYS7KDirPhuyOjl6qIthz9f jGh4x4g32dIudNgSmY0XDR1qbJR5QvHrLcQKYPP+bLWU4mMrbkc9o5rvc7l69QUAPM0MHi5kicm KeXBVy/MUT3ipFfxw2pEHy6gyWBB+qJ7l/ZNH3kUqS+NdMi0dqnx2+Shoi4S9jJyGs9Ex9tiV5z EIicyhVyhgyrykyCL4g== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_03,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 clxscore=1015 bulkscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160087 The RPMB authentication key is derived from the dev_id handed to the RPMB subsystem. OP-TEE implements the eMMC RPMB flow, where the dev_id is the eMMC CID, a fixed 16-byte value, and it derives the key on that assumption. The UFS RPMB id built here is "-R", which is variable length and longer than 16 bytes. Passing it verbatim would tie the derived key to a length OP-TEE does not expect and diverge from the fixed-CID eMMC ABI, requiring OP-TEE to be taught about variable-length UFS ids. Hash the UFS id into a fixed 16-byte dev_id with blake2s instead. This keeps the derived key stable and unique per region while matching the eMMC CID layout OP-TEE relies on, so the key-derivation ABI stays identical and no OP-TEE change is needed. Signed-off-by: Jorge Ramirez-Ortiz --- drivers/ufs/core/ufs-rpmb.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/ufs/core/ufs-rpmb.c b/drivers/ufs/core/ufs-rpmb.c index d0c7ea7a36f4..b800871269bb 100644 --- a/drivers/ufs/core/ufs-rpmb.c +++ b/drivers/ufs/core/ufs-rpmb.c @@ -10,6 +10,7 @@ * Can Guo */ +#include #include #include #include @@ -21,6 +22,7 @@ #include #include "ufshcd-priv.h" +#define UFS_RPMB_ID_LEN 16 /* Match eMMC CID Length */ #define UFS_RPMB_SEC_PROTOCOL 0xEC /* JEDEC UFS application */ #define UFS_RPMB_SEC_PROTOCOL_ID 0x01 /* JEDEC UFS RPMB protocol ID, CDB byte3 */ @@ -154,6 +156,7 @@ int ufs_rpmb_probe(struct ufs_hba *hba) { struct ufs_rpmb_dev *ufs_rpmb, *it, *tmp; struct rpmb_dev *rdev; + char *dev_id = NULL; char *cid = NULL; int region; u32 cap; @@ -213,8 +216,17 @@ int ufs_rpmb_probe(struct ufs_hba *hba) goto err_out; } - descr.dev_id = cid; - descr.dev_id_len = strlen(cid); + dev_id = kzalloc(UFS_RPMB_ID_LEN, GFP_KERNEL); + if (!dev_id) { + device_unregister(&ufs_rpmb->dev); + ret = -ENOMEM; + goto err_out; + } + + blake2s(NULL, 0, cid, strlen(cid), dev_id, UFS_RPMB_ID_LEN); + + descr.dev_id = dev_id; + descr.dev_id_len = UFS_RPMB_ID_LEN; descr.capacity = cap; /* Register RPMB device */ @@ -228,6 +240,8 @@ int ufs_rpmb_probe(struct ufs_hba *hba) kfree(cid); cid = NULL; + kfree(dev_id); + dev_id = NULL; ufs_rpmb->rdev = rdev; ufs_rpmb->region_id = region; @@ -240,6 +254,7 @@ int ufs_rpmb_probe(struct ufs_hba *hba) return 0; err_out: kfree(cid); + kfree(dev_id); list_for_each_entry_safe(it, tmp, &hba->rpmbs, node) { list_del(&it->node); device_unregister(&it->dev); -- 2.54.0