Merge tag 'v6.18-p5' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

torvalds · torvalds · commit b86caedd0b2c · 2025-11-14T08:32:58.000-08:00
Pull crypto fix from Herbert Xu:

 - Fix device reference leak in hisilicon

* tag 'v6.18-p5' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: hisilicon/qm - Fix device reference leak in qm_get_qos_value
diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
@@ -3871,10 +3871,12 @@ static ssize_t qm_get_qos_value(struct hisi_qm *qm, const char *buf,
 	pdev = container_of(dev, struct pci_dev, dev);
 	if (pci_physfn(pdev) != qm->pdev) {
 		pci_err(qm->pdev, "the pdev input does not match the pf!\n");
+		put_device(dev);
 		return -EINVAL;
 	}
 
 	*fun_index = pdev->devfn;
+	put_device(dev);
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -3871,10 +3871,12 @@ static ssize_t qm_get_qos_value(struct hisi_qm qm, const char buf,`
`3871`	`3871`	`pdev = container_of(dev, struct pci_dev, dev);`
`3872`	`3872`	`if (pci_physfn(pdev) != qm->pdev) {`
`3873`	`3873`	`pci_err(qm->pdev, "the pdev input does not match the pf!\n");`
	`3874`	`+ put_device(dev);`
`3874`	`3875`	`return -EINVAL;`
`3875`	`3876`	`}`
`3876`	`3877`
`3877`	`3878`	`*fun_index = pdev->devfn;`
	`3879`	`+ put_device(dev);`
`3878`	`3880`
`3879`	`3881`	`return 0;`
`3880`	`3882`	`}`