NotificationsYou must be signed in to change notification settings
Fork0
Star2

Commite5acf0e

committed

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

2 parents0746c4a +b8e2c8b commite5acf0eCopy full SHA for e5acf0e

File tree

3 files changed

-5

lines changed

drivers/ntb
- hw
  - amd
    - ntb_hw_amd.c
  - intel
    - ntb_hw_gen1.c
- test
  - ntb_msi_test.c

3 files changed

-5

lines changed

`‎drivers/ntb/hw/amd/ntb_hw_amd.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1203,6 +1203,7 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev,`
`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:`

`‎drivers/ntb/hw/intel/ntb_hw_gen1.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1893,7 +1893,7 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev,`
`1893`	`1893`	`gotoerr_init_dev;`
`1894`	`1894`	`}else {`
`1895`	`1895`	`rc=-EINVAL;`
`1896`		`-gotoerr_ndev;`
	`1896`	`+gotoerr_init_pci;`
`1897`	`1897`	`}`
`1898`	`1898`
`1899`	`1899`	`ndev_reset_unsafe_flags(ndev);`

`‎drivers/ntb/test/ntb_msi_test.c‎`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,6 @@ static void ntb_msit_remove_dbgfs(struct ntb_msit_ctx *nm)`
`319`	`319`	`staticintntb_msit_probe(structntb_clientclient,structntb_devntb)`
`320`	`320`	`{`
`321`	`321`	`structntb_msit_ctx*nm;`
`322`		`-size_tstruct_size;`
`323`	`322`	`intpeers;`
`324`	`323`	`intret;`
`325`	`324`
`@@ -352,9 +351,7 @@ static int ntb_msit_probe(struct ntb_client client, struct ntb_dev ntb)`
`352`	`351`	`returnret;`
`353`	`352`	`}`
`354`	`353`
`355`		`-struct_size=sizeof(nm)+sizeof(nm->peers)*peers;`
`356`		`-`
`357`		`-nm=devm_kzalloc(&ntb->dev,struct_size,GFP_KERNEL);`
	`354`	`+nm=devm_kzalloc(&ntb->dev,struct_size(nm,peers,peers),GFP_KERNEL);`
`358`	`355`	`if (!nm)`
`359`	`356`	`return-ENOMEM;`
`360`	`357`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite5acf0e

File tree

3 files changed

3 files changed

`‎drivers/ntb/hw/amd/ntb_hw_amd.c‎`

`‎drivers/ntb/hw/intel/ntb_hw_gen1.c‎`

`‎drivers/ntb/test/ntb_msi_test.c‎`

0 commit comments