[kamailio/kamailio] ims_ipsec_pcscf: closing mnl_socket in some exceptional situations (#2114)
- fix leak socket when error handling errors in creation or destruction ipsec tunnel
<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> Fixed socket leak on error during ipsec tunnel creation or destruction. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2114
-- Commit Summary --
* ims_ipsec_pcscf: closing mnl_socket in some exceptional situations
-- File Changes --
M src/modules/ims_ipsec_pcscf/cmd.c (5)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2114.patch https://github.com/kamailio/kamailio/pull/2114.diff
I looked into the existing code of the function create_ipsec_tunnel(..)
Are you sure that the "return 0" in the error cases is correct? Should it not be -1, as in the one case in the bottom of the function? If yes - then it makes probably sense to combine them all into one "goto error" case.
Thank you for the pull request. I looked into the existing code of the function create_ipsec_tunnel(..)
Are you sure that the "return 0" in the error cases is correct? Should it not be -1, as in the one case in the bottom of the function? If yes - then it makes probably sense to combine them all into one "goto error" case.
Hi, I am pretty sure that all return codes in error cases should be changed to -1. I am working on this module actively and return code 0 in these error cases will cause problems for sure.
@henningw, @alexyosifov - looking at the patch, the pull request here is not adding any `return 0`, they existed. The patch is adding a couple of `close_mnl_socket(sock)`. If the existing `return 0` in error cases are wrong, then they need to be fixed of course. But it is not a strict relation with this PR.
@henningw, @alexyosifov - looking at the patch, the pull request here is not adding any `return 0`, they existed. The patch is adding a couple of `close_mnl_socket(sock)`.
If the existing `return 0` in error cases are wrong, then they need to be fixed of course. But it is not a strict relation with this PR.
Hi, I'll fix the problem with the error codes in the next ipsec pull request from my side.
@miconda - I know. :-) But as @alexyosifov was working on the code right now, I wanted to ask him about his opinion.
Merged #2114 into master.
Merged, will also backport to stable branches.
-
alexyosifov -
Daniel-Constantin Mierla
-
Henning Westerholt
-
Stanislav Litvinenko