Commit 5c59789c authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-6.1-2022-11-18' of git://git.infradead.org/nvme into block-6.1 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 6.1

 - two more bogus nid quirks (Bean Huo, Tiago Dias Ferreira)
 - memory leak fix in nvmet (Sagi Grimberg)"

* tag 'nvme-6.1-2022-11-18' of git://git.infradead.org/nvme:
  nvmet: fix a memory leak in nvmet_auth_set_key
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Netac NV7000
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Micron Nitro
parents 50a89335 0a525662

drivers/nvme/host/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -3489,6 +3489,8 @@ static const struct pci_device_id nvme_id_table[] = { 
				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	 { PCI_DEVICE(0x1344, 0x5407), /* Micron Technology Inc NVMe SSD */

		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN },

	 { PCI_DEVICE(0x1344, 0x6001),   /* Micron Nitro NVMe */

		 .driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1c5c, 0x1504),   /* SK Hynix PC400 */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x1c5c, 0x174a),   /* SK Hynix P31 SSD */
@@ -3519,6 +3521,8 @@ static const struct pci_device_id nvme_id_table[] = { 
		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x2646, 0x501E),   /* KINGSTON OM3PGP4xxxxQ OS21011 NVMe SSD */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x1f40, 0x5236),   /* Netac Technologies Co. NV7000 NVMe SSD */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1e4B, 0x1001),   /* MAXIO MAP1001 */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1e4B, 0x1002),   /* MAXIO MAP1002 */

drivers/nvme/target/auth.c

+2 −0
Original line number Diff line number Diff line
@@ -45,9 +45,11 @@ int nvmet_auth_set_key(struct nvmet_host *host, const char *secret, 
	if (!dhchap_secret)

		return -ENOMEM;

	if (set_ctrl) {

		kfree(host->dhchap_ctrl_secret);

		host->dhchap_ctrl_secret = strim(dhchap_secret);

		host->dhchap_ctrl_key_hash = key_hash;

	} else {

		kfree(host->dhchap_secret);

		host->dhchap_secret = strim(dhchap_secret);

		host->dhchap_key_hash = key_hash;

	}