From 7be1f17138f19d1d7a86e0c27b3662d3643ff296 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Mon, 21 Oct 2019 12:59:23 +0000 Subject: [PATCH] file: exec: properly free memory on error Signed-off-by: Yousong Zhou [fix whitespace] Signed-off-by: Jo-Philipp Wich (cherry picked from commit 90e40bd3d5b6d164be4c1f3583a13dc2f34d6563) --- file.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/file.c b/file.c index 016f264..9c5cbbb 100644 --- a/file.c +++ b/file.c @@ -626,13 +626,16 @@ rpc_file_exec_run(const char *cmd, if (!c) return UBUS_STATUS_UNKNOWN_ERROR; - if (pipe(opipe) || pipe(epipe)) - return rpc_errno_status(); + if (pipe(opipe)) + goto fail_opipe; + + if (pipe(epipe)) + goto fail_epipe; switch ((pid = fork())) { case -1: - return rpc_errno_status(); + goto fail_fork; case 0: uloop_done(); @@ -724,6 +727,18 @@ rpc_file_exec_run(const char *cmd, } return UBUS_STATUS_OK; + +fail_fork: + close(epipe[0]); + close(epipe[1]); + +fail_epipe: + close(opipe[0]); + close(opipe[1]); + +fail_opipe: + free(c); + return rpc_errno_status(); } static int -- 2.25.1