Commit 411ea679 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fixes from Ulf Hansson:
 "MMC core:
   - Fix use-after-free issue for rpmb partition

  MMC host:
   - Fix quirk for broken CQE support"

* tag 'mmc-v5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: block: Fix use-after-free issue for rpmb
  mmc: sdhci: Fix SDHCI_QUIRK_BROKEN_CQE
parents d54b64ef 202500d2

drivers/mmc/core/block.c

+1 −1
Original line number Diff line number Diff line
@@ -2484,8 +2484,8 @@ static int mmc_rpmb_chrdev_release(struct inode *inode, struct file *filp) 
	struct mmc_rpmb_data *rpmb = container_of(inode->i_cdev,

						  struct mmc_rpmb_data, chrdev);



	put_device(&rpmb->dev);

	mmc_blk_put(rpmb->md);

	put_device(&rpmb->dev);



	return 0;

}

drivers/mmc/host/sdhci.c

+6 −3
Original line number Diff line number Diff line
@@ -4000,9 +4000,6 @@ int sdhci_setup_host(struct sdhci_host *host) 
		       mmc_hostname(mmc), host->version);

	}



	if (host->quirks & SDHCI_QUIRK_BROKEN_CQE)

		mmc->caps2 &= ~MMC_CAP2_CQE;



	if (host->quirks & SDHCI_QUIRK_FORCE_DMA)

		host->flags |= SDHCI_USE_SDMA;

	else if (!(host->caps & SDHCI_CAN_DO_SDMA))
@@ -4539,6 +4536,12 @@ int __sdhci_add_host(struct sdhci_host *host) 
	struct mmc_host *mmc = host->mmc;

	int ret;



	if ((mmc->caps2 & MMC_CAP2_CQE) &&

	    (host->quirks & SDHCI_QUIRK_BROKEN_CQE)) {

		mmc->caps2 &= ~MMC_CAP2_CQE;

		mmc->cqe_ops = NULL;

	}



	host->complete_wq = alloc_workqueue("sdhci", flags, 0);

	if (!host->complete_wq)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE