diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-25 21:12:31 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-25 21:12:31 +0300 |
commit | e5acf0ed8a5f0af084b0fdb53b0c7aad47dab29b (patch) | |
tree | 0631fd4d9a9566e0369d00a393d6c39e59ee0b3a /drivers/ntb/test/ntb_msi_test.c | |
parent | 0746c4a9f3d37caf73fb93420bcf34a841019a40 (diff) | |
parent | b8e2c8bbdf7778c6e3c65db21ababb1dfa794282 (diff) | |
download | linux-e5acf0ed8a5f0af084b0fdb53b0c7aad47dab29b.tar.xz |
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
Diffstat (limited to 'drivers/ntb/test/ntb_msi_test.c')
-rw-r--r-- | drivers/ntb/test/ntb_msi_test.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ntb/test/ntb_msi_test.c b/drivers/ntb/test/ntb_msi_test.c index 99d826ed9c34..7095ecd6223a 100644 --- a/drivers/ntb/test/ntb_msi_test.c +++ b/drivers/ntb/test/ntb_msi_test.c @@ -319,7 +319,6 @@ static void ntb_msit_remove_dbgfs(struct ntb_msit_ctx *nm) static int ntb_msit_probe(struct ntb_client *client, struct ntb_dev *ntb) { struct ntb_msit_ctx *nm; - size_t struct_size; int peers; int ret; @@ -352,9 +351,7 @@ static int ntb_msit_probe(struct ntb_client *client, struct ntb_dev *ntb) return ret; } - struct_size = sizeof(*nm) + sizeof(*nm->peers) * peers; - - nm = devm_kzalloc(&ntb->dev, struct_size, GFP_KERNEL); + nm = devm_kzalloc(&ntb->dev, struct_size(nm, peers, peers), GFP_KERNEL); if (!nm) return -ENOMEM; |