tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'ntb-5.10' of git://github.com/jonmason/ntb

Pull NTB fixes from Jon Mason.

* tag 'ntb-5.10' of git://github.com/jonmason/ntb:
NTB: Use struct_size() helper in devm_kzalloc()
ntb: intel: Fix memleak in intel_ntb_pci_probe
NTB: hw: amd: fix an issue about leak system resources

Linus Torvalds e5acf0ed 0746c4a9

+3 -5
+1
drivers/ntb/hw/amd/ntb_hw_amd.c
··· 1203 1203 1204 1204 err_dma_mask: 1205 1205 pci_clear_master(pdev); 1206 + pci_release_regions(pdev); 1206 1207 err_pci_regions: 1207 1208 pci_disable_device(pdev); 1208 1209 err_pci_enable:
+1 -1
drivers/ntb/hw/intel/ntb_hw_gen1.c
··· 1893 1893 goto err_init_dev; 1894 1894 } else { 1895 1895 rc = -EINVAL; 1896 - goto err_ndev; 1896 + goto err_init_pci; 1897 1897 } 1898 1898 1899 1899 ndev_reset_unsafe_flags(ndev);
+1 -4
drivers/ntb/test/ntb_msi_test.c
··· 319 319 static int ntb_msit_probe(struct ntb_client *client, struct ntb_dev *ntb) 320 320 { 321 321 struct ntb_msit_ctx *nm; 322 - size_t struct_size; 323 322 int peers; 324 323 int ret; 325 324 ··· 351 352 return ret; 352 353 } 353 354 354 - struct_size = sizeof(*nm) + sizeof(*nm->peers) * peers; 355 - 356 - nm = devm_kzalloc(&ntb->dev, struct_size, GFP_KERNEL); 355 + nm = devm_kzalloc(&ntb->dev, struct_size(nm, peers, peers), GFP_KERNEL); 357 356 if (!nm) 358 357 return -ENOMEM; 359 358