From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756315AbbKSJ0w (ORCPT ); Thu, 19 Nov 2015 04:26:52 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:16862 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750819AbbKSJ0t (ORCPT ); Thu, 19 Nov 2015 04:26:49 -0500 X-IronPort-AV: E=Sophos;i="5.20,242,1444665600"; d="scan'208";a="623330" From: Wei Jiangang To: CC: , , , , , Subject: [PATCH v2] tools: ffs-aio-example: clean up upon failure Date: Thu, 19 Nov 2015 17:26:08 +0800 Message-ID: <1447925168-6042-1-git-send-email-weijg.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <564C48D9.8060507@samsung.com> References: <564C48D9.8060507@samsung.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.167.226.50] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Free buffer to avoid memory leak and close fd upon failure occurs. Signed-off-by: Wei Jiangang --- tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c | 6 ++++++ tools/usb/ffs-aio-example/simple/device_app/aio_simple.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c index aaca1f44e788..c08b1b0f7a6b 100644 --- a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c +++ b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c @@ -263,20 +263,26 @@ int main(int argc, char *argv[]) sprintf(ep_path, "%s/ep0", argv[1]); ep0 = open(ep_path, O_RDWR); if (ep0 < 0) { + free(ep_path); perror("unable to open ep0"); return 1; } if (write(ep0, &descriptors, sizeof(descriptors)) < 0) { + close(ep0); + free(ep_path); perror("unable do write descriptors"); return 1; } if (write(ep0, &strings, sizeof(strings)) < 0) { + close(ep0); + free(ep_path); perror("unable to write strings"); return 1; } sprintf(ep_path, "%s/ep1", argv[1]); ep1 = open(ep_path, O_RDWR); if (ep1 < 0) { + free(ep_path); perror("unable to open ep1"); return 1; } diff --git a/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c b/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c index 1f44a29818bf..9ff657ed0bec 100644 --- a/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c +++ b/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c @@ -234,14 +234,19 @@ int main(int argc, char *argv[]) sprintf(ep_path, "%s/ep0", argv[1]); ep0 = open(ep_path, O_RDWR); if (ep0 < 0) { + free(ep_path); perror("unable to open ep0"); return 1; } if (write(ep0, &descriptors, sizeof(descriptors)) < 0) { + close(ep0); + free(ep_path); perror("unable do write descriptors"); return 1; } if (write(ep0, &strings, sizeof(strings)) < 0) { + close(ep0); + free(ep_path); perror("unable to write strings"); return 1; } @@ -249,6 +254,7 @@ int main(int argc, char *argv[]) sprintf(ep_path, "%s/ep%d", argv[1], i+1); ep[i] = open(ep_path, O_RDWR); if (ep[i] < 0) { + free(ep_path); printf("unable to open ep%d: %s\n", i+1, strerror(errno)); return 1; -- 1.9.3