Skip to content

Commit 8355838

Browse files
committed
netdevsim: Fix memory leak of nsim_dev->fa_cookie
jira VULN-65791 cve CVE-2022-49803 commit-author Wang Yufen <[email protected]> commit 064bc73 upstream-diff Minor conflicts because this kernel uses devlink_resources_unregister instead of devl_resources_unregister and because this kernel doesn't call devl_unlock(devlink). kmemleak reports this issue: unreferenced object 0xffff8881bac872d0 (size 8): comm "sh", pid 58603, jiffies 4481524462 (age 68.065s) hex dump (first 8 bytes): 04 00 00 00 de ad be ef ........ backtrace: [<00000000c80b8577>] __kmalloc+0x49/0x150 [<000000005292b8c6>] nsim_dev_trap_fa_cookie_write+0xc1/0x210 [netdevsim] [<0000000093d78e77>] full_proxy_write+0xf3/0x180 [<000000005a662c16>] vfs_write+0x1c5/0xaf0 [<000000007aabf84a>] ksys_write+0xed/0x1c0 [<000000005f1d2e47>] do_syscall_64+0x3b/0x90 [<000000006001c6ec>] entry_SYSCALL_64_after_hwframe+0x63/0xcd The issue occurs in the following scenarios: nsim_dev_trap_fa_cookie_write() kmalloc() fa_cookie nsim_dev->fa_cookie = fa_cookie .. nsim_drv_remove() The fa_cookie allocked in nsim_dev_trap_fa_cookie_write() is not freed. To fix, add kfree(nsim_dev->fa_cookie) to nsim_drv_remove(). Fixes: d3cbb90 ("netdevsim: add ACL trap reporting cookie as a metadata") Signed-off-by: Wang Yufen <[email protected]> Cc: Jiri Pirko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> (cherry picked from commit 064bc73) Signed-off-by: Brett Mastbergen <[email protected]>
1 parent b26c9f0 commit 8355838

File tree

1 file changed

+1
-0
lines changed
  • drivers/net/netdevsim

1 file changed

+1
-0
lines changed

drivers/net/netdevsim/dev.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,6 +1660,7 @@ void nsim_drv_remove(struct nsim_bus_dev *nsim_bus_dev)
16601660
ARRAY_SIZE(nsim_devlink_params));
16611661
devlink_resources_unregister(devlink);
16621662
kfree(nsim_dev->vfconfigs);
1663+
kfree(nsim_dev->fa_cookie);
16631664
devlink_free(devlink);
16641665
dev_set_drvdata(&nsim_bus_dev->dev, NULL);
16651666
}

0 commit comments

Comments
 (0)