]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
nfp: Fix memory leak in nfp_cpp_area_cache_add()
authorJianglei Nie <niejianglei2021@163.com>
Thu, 9 Dec 2021 06:15:11 +0000 (14:15 +0800)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:49:15 +0000 (09:49 +0100)
commitd9f9c3ed6b9da8bcf75453b285bc724a421fdc3e
tree3c73c671aff055f9e93ecb4db9c33fdd4ce7740b
parentf7f737c6058e39dfe7636f76bab6d23258f0c158
nfp: Fix memory leak in nfp_cpp_area_cache_add()

BugLink: https://bugs.launchpad.net/bugs/1954931
commit c56c96303e9289cc34716b1179597b6f470833de upstream.

In line 800 (#1), nfp_cpp_area_alloc() allocates and initializes a
CPP area structure. But in line 807 (#2), when the cache is allocated
failed, this CPP area structure is not freed, which will result in
memory leak.

We can fix it by freeing the CPP area when the cache is allocated
failed (#2).

792 int nfp_cpp_area_cache_add(struct nfp_cpp *cpp, size_t size)
793 {
794  struct nfp_cpp_area_cache *cache;
795  struct nfp_cpp_area *area;

800 area = nfp_cpp_area_alloc(cpp, NFP_CPP_ID(7, NFP_CPP_ACTION_RW, 0),
801    0, size);
// #1: allocates and initializes

802  if (!area)
803  return -ENOMEM;

805  cache = kzalloc(sizeof(*cache), GFP_KERNEL);
806  if (!cache)
807  return -ENOMEM; // #2: missing free

817 return 0;
818 }

Fixes: 4cb584e0ee7d ("nfp: add CPP access core")
Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
Acked-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20211209061511.122535-1-niejianglei2021@163.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c