diff options
| author | Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> | 2020-06-02 19:41:02 -0700 |
|---|---|---|
| committer | Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> | 2020-06-03 15:08:29 -0700 |
| commit | 8b0de912c698d33ec721688f100eb88d4c8a4dc3 (patch) | |
| tree | 4b53e5f4a09b09a6c5bbbaaa7f0055a142316112 | |
| parent | 2745d13bb8ec88dad5e73a5649d98eb4728b3cce (diff) | |
rmnetcli: Fix use after free during deinit
Fix use-after-free cause by a double cleanup.
Cleanup will now be dependent on API used.
Change-Id: I7e3d31eec23157eb66bcf5661fb3549c5fd7cd04
| -rw-r--r-- | rmnetctl/cli/rmnetcli.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/rmnetctl/cli/rmnetcli.c b/rmnetctl/cli/rmnetcli.c index 4e249a0..8b60127 100644 --- a/rmnetctl/cli/rmnetcli.c +++ b/rmnetctl/cli/rmnetcli.c @@ -2,7 +2,7 @@ R M N E T C L I . C -Copyright (c) 2013-2015, 2017-2019 The Linux Foundation. All rights reserved. +Copyright (c) 2013-2015, 2017-2020 The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -320,6 +320,8 @@ static int rmnet_api_call(int argc, char *argv[]) struct rmnetctl_hndl_s *handle = NULL; uint16_t error_number = RMNETCTL_CFG_FAILURE_NO_COMMAND; int return_code = RMNETCTL_LIB_ERR; + int is_new_api = 0; + if ((!argc) || (!*argv)) { print_rmnet_api_status(RMNETCTL_LIB_ERR, RMNETCTL_CFG_FAILURE_NO_COMMAND); @@ -332,6 +334,7 @@ static int rmnet_api_call(int argc, char *argv[]) } if (!strcmp(*argv, "-n")) { + is_new_api = 1; return_code = rtrmnet_ctl_init(&handle, &error_number); if (return_code != RMNETCTL_SUCCESS) { print_rmnet_api_status(return_code, error_number); @@ -631,8 +634,10 @@ static int rmnet_api_call(int argc, char *argv[]) } end: print_rmnet_api_status(return_code, error_number); - rmnetctl_cleanup(handle); - rtrmnet_ctl_deinit(handle); + if (is_new_api) + rtrmnet_ctl_deinit(handle); + else + rmnetctl_cleanup(handle); return return_code; } |