From patchwork Fri Sep 11 07:15:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 11769851 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB00E1580 for ; Fri, 11 Sep 2020 07:16:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B988B22206 for ; Fri, 11 Sep 2020 07:16:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jLZ/Ag1U" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725766AbgIKHQ0 (ORCPT ); Fri, 11 Sep 2020 03:16:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21116 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725800AbgIKHQX (ORCPT ); Fri, 11 Sep 2020 03:16:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599808579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xUX9+Uqronuw2LQLKM0qPs+cbua4QkBc9rAbkuj5dmI=; b=jLZ/Ag1UCgkvW7UYbmMfKZRHt4fa2sTR62L0f6lRHACF9hZuheEe2MquUEA0awliSji2a2 ZQ1G2tnqxQi6vQ6lQf9t7po7yz9KwEgPA2cQeJzrQRaAQJLx7hKQtpBEcuS1fRzwO9YYYr IAOet8LupTOUDEEu0Fd3SIfOhGHDMH0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-82-weOB55Z9PDi8a9ZHOcHNmA-1; Fri, 11 Sep 2020 03:16:17 -0400 X-MC-Unique: weOB55Z9PDi8a9ZHOcHNmA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D744C1008550 for ; Fri, 11 Sep 2020 07:16:16 +0000 (UTC) Received: from bogon.redhat.com (ovpn-12-40.pek2.redhat.com [10.72.12.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id E354210013BD for ; Fri, 11 Sep 2020 07:16:14 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH v5 3/5] fsstress: fix memory leak in do_aio_rw Date: Fri, 11 Sep 2020 15:15:53 +0800 Message-Id: <20200911071555.31506-4-zlang@redhat.com> In-Reply-To: <20200911071555.31506-1-zlang@redhat.com> References: <20200911071555.31506-1-zlang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org If io_submit or io_getevents fails, the do_aio_rw() won't free the "buf" and cause memory leak. Signed-off-by: Zorro Lang Reviewed-by: Brian Foster --- ltp/fsstress.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 68fbf7a5..1238fcf5 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -2078,11 +2078,11 @@ void do_aio_rw(int opno, long r, int flags) { int64_t align; - char *buf; + char *buf = NULL; struct dioattr diob; int e; pathname_t f; - int fd; + int fd = -1; size_t len; int64_t lr; off64_t off; @@ -2099,8 +2099,7 @@ do_aio_rw(int opno, long r, int flags) if (!get_fname(FT_REGFILE, r, &f, NULL, NULL, &v)) { if (v) printf("%d/%d: do_aio_rw - no filename\n", procid, opno); - free_pathname(&f); - return; + goto aio_out; } fd = open_path(&f, flags|O_DIRECT); e = fd < 0 ? errno : 0; @@ -2109,25 +2108,20 @@ do_aio_rw(int opno, long r, int flags) if (v) printf("%d/%d: do_aio_rw - open %s failed %d\n", procid, opno, f.path, e); - free_pathname(&f); - return; + goto aio_out; } if (fstat64(fd, &stb) < 0) { if (v) printf("%d/%d: do_aio_rw - fstat64 %s failed %d\n", procid, opno, f.path, errno); - free_pathname(&f); - close(fd); - return; + goto aio_out; } inode_info(st, sizeof(st), &stb, v); if (!iswrite && stb.st_size == 0) { if (v) printf("%d/%d: do_aio_rw - %s%s zero size\n", procid, opno, f.path, st); - free_pathname(&f); - close(fd); - return; + goto aio_out; } if (xfsctl(f.path, fd, XFS_IOC_DIOINFO, &diob) < 0) { if (v) @@ -2150,6 +2144,12 @@ do_aio_rw(int opno, long r, int flags) else if (len > diob.d_maxiosz) len = diob.d_maxiosz; buf = memalign(diob.d_mem, len); + if (!buf) { + if (v) + printf("%d/%d: do_aio_rw - memalign failed\n", + procid, opno); + goto aio_out; + } if (iswrite) { off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE)); @@ -2166,27 +2166,26 @@ do_aio_rw(int opno, long r, int flags) if (v) printf("%d/%d: %s - io_submit failed %d\n", procid, opno, iswrite ? "awrite" : "aread", e); - free_pathname(&f); - close(fd); - return; + goto aio_out; } if ((e = io_getevents(io_ctx, 1, 1, &event, NULL)) != 1) { if (v) printf("%d/%d: %s - io_getevents failed %d\n", procid, opno, iswrite ? "awrite" : "aread", e); - free_pathname(&f); - close(fd); - return; + goto aio_out; } e = event.res != len ? event.res2 : 0; - free(buf); if (v) printf("%d/%d: %s %s%s [%lld,%d] %d\n", procid, opno, iswrite ? "awrite" : "aread", f.path, st, (long long)off, (int)len, e); + aio_out: + if (buf) + free(buf); + if (fd != -1) + close(fd); free_pathname(&f); - close(fd); } #endif