Linux-Next discussions
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Kees Cook <kees@kernel.org>, Kees Cook <kees+treewide@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	"Martin K. Petersen" <mkp@kernel.org>,
	Stanley Jhu <stanleyjhu@google.com>
Subject: linux-next: manual merge of the scsi-fixes tree with the origin tree
Date: Wed, 18 Nov 2026 13:29:04 +0000	[thread overview]
Message-ID: <av2oIDU7KF0EPfbw@sirena.org.uk> (raw)

[-- Attachment #1: Type: text/plain, Size: 7920 bytes --]

Hi all,

Today's linux-next merge of the scsi-fixes tree got a conflict in:

  drivers/ufs/core/ufs-rpmb.c

between commit:

  4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")

from the origin tree and commit:

  7bc9b854cd68e ("scsi: ufs: rpmb: Decouple device lifecycle from devres to avoid UAF")

from the scsi-fixes tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/ufs/core/ufs-rpmb.c
index 7566733376480,6803f3e62d786..0000000000000
--- a/drivers/ufs/core/ufs-rpmb.c
+++ b/drivers/ufs/core/ufs-rpmb.c
@@@ -14,6 -14,7 +14,7 @@@
  #include <linux/module.h>
  #include <linux/device.h>
  #include <linux/kernel.h>
+ #include <linux/slab.h>
  #include <linux/types.h>
  #include <linux/rpmb.h>
  #include <linux/string.h>
@@@ -27,22 -28,19 +28,19 @@@
  #define UFS_RPMB_SEC_PROTOCOL		0xEC	/* JEDEC UFS application */
  #define UFS_RPMB_SEC_PROTOCOL_ID	0x01	/* JEDEC UFS RPMB protocol ID, CDB byte3 */
  
- static const struct bus_type ufs_rpmb_bus_type = {
- 	.name = "ufs_rpmb",
- };
- 
  /* UFS RPMB device structure */
  struct ufs_rpmb_dev {
  	u8 region_id;
  	struct device dev;
  	struct rpmb_dev *rdev;
- 	struct ufs_hba *hba;
+ 	struct scsi_device *sdev;
  	struct list_head node;
  };
  
- static int ufs_sec_submit(struct ufs_hba *hba, u16 spsp, void *buffer, size_t len, bool send)
+ static int ufs_sec_submit(struct ufs_rpmb_dev *ufs_rpmb, u16 spsp,
+ 			  void *buffer, size_t len, bool send)
  {
- 	struct scsi_device *sdev = hba->ufs_rpmb_wlun;
+ 	struct scsi_device *sdev = ufs_rpmb->sdev;
  	struct scsi_failure failure_defs[] = {
  		{
  			.sense_key = UNIT_ATTENTION,
@@@ -62,6 -60,9 +60,9 @@@
  	};
  	u8 cdb[12] = { };
  
+ 	if (!sdev || !scsi_device_online(sdev))
+ 		return -ENODEV;
+ 
  	cdb[0] = send ? SECURITY_PROTOCOL_OUT : SECURITY_PROTOCOL_IN;
  	cdb[1] = UFS_RPMB_SEC_PROTOCOL;
  	put_unaligned_be16(spsp, &cdb[2]);
@@@ -74,13 -75,12 +75,12 @@@
  
  /* UFS RPMB route frames implementation */
  static int ufs_rpmb_route_frames(struct device *dev, u8 *req, unsigned int req_len, u8 *resp,
- 					unsigned int resp_len)
+ 				 unsigned int resp_len)
  {
  	struct ufs_rpmb_dev *ufs_rpmb = dev_get_drvdata(dev);
  	struct rpmb_frame *frm_out = (struct rpmb_frame *)req;
  	bool need_result_read = true;
  	u16 req_type, protocol_id;
- 	struct ufs_hba *hba;
  	int ret;
  
  	if (!ufs_rpmb) {
@@@ -88,8 -88,6 +88,6 @@@
  		return -ENODEV;
  	}
  
- 	hba = ufs_rpmb->hba;
- 
  	/* req_resp is at the end of an RPMB frame. */
  	if (req_len < sizeof(*frm_out))
  		return -EINVAL;
@@@ -122,7 -120,7 +120,7 @@@
  
  	protocol_id = ufs_rpmb->region_id << 8 | UFS_RPMB_SEC_PROTOCOL_ID;
  
- 	ret = ufs_sec_submit(hba, protocol_id, req, req_len, true);
+ 	ret = ufs_sec_submit(ufs_rpmb, protocol_id, req, req_len, true);
  	if (ret) {
  		dev_err(dev, "Command failed with ret=%d\n", ret);
  		return ret;
@@@ -133,7 -131,8 +131,8 @@@
  
  		memset(frm_resp, 0, sizeof(*frm_resp));
  		put_unaligned_be16(RPMB_RESULT_READ, &frm_resp->req_resp);
- 		ret = ufs_sec_submit(hba, protocol_id, resp, resp_len, true);
+ 		ret = ufs_sec_submit(ufs_rpmb, protocol_id, resp, resp_len,
+ 				     true);
  		if (ret) {
  			dev_err(dev, "Result read request failed with ret=%d\n", ret);
  			return ret;
@@@ -141,7 -140,8 +140,8 @@@
  	}
  
  	if (!ret) {
- 		ret = ufs_sec_submit(hba, protocol_id, resp, resp_len, false);
+ 		ret = ufs_sec_submit(ufs_rpmb, protocol_id, resp, resp_len,
+ 				     false);
  		if (ret)
  			dev_err(dev, "Response read failed with ret=%d\n", ret);
  	}
@@@ -151,23 -151,31 +151,31 @@@
  
  static void ufs_rpmb_device_release(struct device *dev)
  {
- 	struct ufs_rpmb_dev *ufs_rpmb = dev_get_drvdata(dev);
+ 	struct ufs_rpmb_dev *ufs_rpmb =
+ 		container_of(dev, struct ufs_rpmb_dev, dev);
  
- 	rpmb_dev_unregister(ufs_rpmb->rdev);
+ 	put_device(&ufs_rpmb->sdev->sdev_gendev);
+ 	kfree(ufs_rpmb);
  }
  
  /* UFS RPMB device registration */
  int ufs_rpmb_probe(struct ufs_hba *hba)
  {
+ 	struct rpmb_descr descr = {
+ 		.type = RPMB_TYPE_UFS,
+ 		.route_frames = ufs_rpmb_route_frames,
+ 		.reliable_wr_count = hba->dev_info.rpmb_io_size,
+ 	};
+ 	struct scsi_device *sdev = hba->ufs_rpmb_wlun;
  	struct ufs_rpmb_dev *ufs_rpmb, *it, *tmp;
  	u8 dev_id[UFS_RPMB_ID_LEN];
  	struct rpmb_dev *rdev;
- 	char *cid = NULL;
+ 	char *cid;
  	int region;
  	u32 cap;
  	int ret;
  
- 	if (!hba->ufs_rpmb_wlun || hba->dev_info.b_advanced_rpmb_en) {
+ 	if (!sdev || hba->dev_info.b_advanced_rpmb_en) {
  		dev_info(hba->dev, "Skip OP-TEE RPMB registration\n");
  		return -ENODEV;
  	}
@@@ -178,26 -186,22 +186,22 @@@
  		return -EINVAL;
  	}
  
- 	struct rpmb_descr descr = {
- 		.type = RPMB_TYPE_UFS,
- 		.route_frames = ufs_rpmb_route_frames,
- 		.reliable_wr_count = hba->dev_info.rpmb_io_size,
- 	};
- 
  	for (region = 0; region < ARRAY_SIZE(hba->dev_info.rpmb_region_size); region++) {
  		cap = hba->dev_info.rpmb_region_size[region];
  		if (!cap)
  			continue;
  
- 		ufs_rpmb = devm_kzalloc_obj(hba->dev, *ufs_rpmb);
+ 		ufs_rpmb = kzalloc_obj(*ufs_rpmb);
  		if (!ufs_rpmb) {
  			ret = -ENOMEM;
  			goto err_out;
  		}
  
- 		ufs_rpmb->hba = hba;
- 		ufs_rpmb->dev.parent = &hba->ufs_rpmb_wlun->sdev_gendev;
- 		ufs_rpmb->dev.bus = &ufs_rpmb_bus_type;
+ 		get_device(&sdev->sdev_gendev);
+ 
+ 		ufs_rpmb->sdev = sdev;
+ 		ufs_rpmb->region_id = region;
+ 		ufs_rpmb->dev.parent = &sdev->sdev_gendev;
  		ufs_rpmb->dev.release = ufs_rpmb_device_release;
  		dev_set_name(&ufs_rpmb->dev, "ufs_rpmb%d", region);
  
@@@ -207,16 -211,14 +211,14 @@@
  		ret = device_register(&ufs_rpmb->dev);
  		if (ret) {
  			dev_err(hba->dev, "Failed to register UFS RPMB device %d\n", region);
- 			put_device(&ufs_rpmb->dev);
- 			goto err_out;
+ 			goto err_put;
  		}
  
  		/* Create unique ID by appending region number to device_id */
  		cid = kasprintf(GFP_KERNEL, "%s-R%d", hba->dev_info.device_id, region);
  		if (!cid) {
- 			device_unregister(&ufs_rpmb->dev);
  			ret = -ENOMEM;
- 			goto err_out;
+ 			goto err_unreg;
  		}
  
  		blake2b(NULL, 0, cid, strlen(cid), dev_id, UFS_RPMB_ID_LEN);
@@@ -227,29 -229,30 +229,30 @@@
  
  		/* Register RPMB device */
  		rdev = rpmb_dev_register(&ufs_rpmb->dev, &descr);
+ 		kfree(cid);
  		if (IS_ERR(rdev)) {
  			dev_err(hba->dev, "Failed to register UFS RPMB device.\n");
- 			device_unregister(&ufs_rpmb->dev);
  			ret = PTR_ERR(rdev);
- 			goto err_out;
+ 			goto err_unreg;
  		}
  
- 		kfree(cid);
- 		cid = NULL;
- 
  		ufs_rpmb->rdev = rdev;
- 		ufs_rpmb->region_id = region;
- 
  		list_add_tail(&ufs_rpmb->node, &hba->rpmbs);
  
  		dev_info(hba->dev, "UFS RPMB region %d registered (capacity=%u)\n", region, cap);
  	}
  
  	return 0;
+ 
+ err_unreg:
+ 	device_unregister(&ufs_rpmb->dev);
+ 	goto err_out;
+ err_put:
+ 	put_device(&ufs_rpmb->dev);
  err_out:
- 	kfree(cid);
  	list_for_each_entry_safe(it, tmp, &hba->rpmbs, node) {
  		list_del(&it->node);
+ 		rpmb_dev_unregister(it->rdev);
  		device_unregister(&it->dev);
  	}
  
@@@ -269,6 -272,7 +272,7 @@@ void ufs_rpmb_remove(struct ufs_hba *hb
  		dev_info(hba->dev, "Removing UFS RPMB region %d\n", ufs_rpmb->region_id);
  		/* Remove from list first */
  		list_del(&ufs_rpmb->node);
+ 		rpmb_dev_unregister(ufs_rpmb->rdev);
  		/* Unregister device */
  		device_unregister(&ufs_rpmb->dev);
  	}

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

                 reply	other threads:[~2026-11-18 13:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=av2oIDU7KF0EPfbw@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=kees+treewide@kernel.org \
    --cc=kees@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=mkp@kernel.org \
    --cc=stanleyjhu@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox