All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chenyuan Mi <cymi20@fudan.edu.cn>
To: unlisted-recipients:; (no To-header on input)
Cc: yuanxzhang@fudan.edu.cn, Chenyuan Mi <cymi20@fudan.edu.cn>,
	Xiyu Yang <xiyuyang19@fudan.edu.cn>,
	Xin Tan <tanxin.ctf@gmail.com>, Mark Fasheh <mark@fasheh.com>,
	Joel Becker <jlbec@evilplan.org>,
	Joseph Qi <joseph.qi@linux.alibaba.com>,
	ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org
Subject: [PATCH] ocfs2: Fix handle refcount leak in two exception handling paths
Date: Wed,  8 Sep 2021 14:26:03 +0800	[thread overview]
Message-ID: <20210908062603.6723-1-cymi20@fudan.edu.cn> (raw)

The reference counting issue happens in two exception handling 
paths of ocfs2_replay_truncate_records(). When executing these 
two exception handling paths, the function forgets to decrease 
the refcount of handle increased by ocfs2_start_trans(), causing 
a refcount leak.

Fix this issue by using ocfs2_commit_trans() to decrease the 
refcount of handle in two handling paths.

Signed-off-by: Chenyuan Mi <cymi20@fudan.edu.cn>
Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>

---
 fs/ocfs2/alloc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index f1cc8258d34a..b87960cdda0d 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -5941,7 +5941,7 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
 						 OCFS2_JOURNAL_ACCESS_WRITE);
 		if (status < 0) {
 			mlog_errno(status);
-			goto bail;
+			goto bail_commit;
 		}
 
 		tl->tl_used = cpu_to_le16(i);
@@ -5965,7 +5965,7 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
 						     num_clusters);
 			if (status < 0) {
 				mlog_errno(status);
-				goto bail;
+				goto bail_commit;
 			}
 		}
 
@@ -5975,6 +5975,8 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
 
 	osb->truncated_clusters = 0;
 
+bail_commit:
+	ocfs2_commit_trans(osb, handle);
 bail:
 	return status;
 }
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: Chenyuan Mi <cymi20@fudan.edu.cn>
Cc: Chenyuan Mi <cymi20@fudan.edu.cn>, Xin Tan <tanxin.ctf@gmail.com>,
	Xiyu Yang <xiyuyang19@fudan.edu.cn>,
	yuanxzhang@fudan.edu.cn, linux-kernel@vger.kernel.org,
	ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH] ocfs2: Fix handle refcount leak in two exception handling paths
Date: Wed,  8 Sep 2021 14:26:03 +0800	[thread overview]
Message-ID: <20210908062603.6723-1-cymi20@fudan.edu.cn> (raw)

The reference counting issue happens in two exception handling 
paths of ocfs2_replay_truncate_records(). When executing these 
two exception handling paths, the function forgets to decrease 
the refcount of handle increased by ocfs2_start_trans(), causing 
a refcount leak.

Fix this issue by using ocfs2_commit_trans() to decrease the 
refcount of handle in two handling paths.

Signed-off-by: Chenyuan Mi <cymi20@fudan.edu.cn>
Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>

---
 fs/ocfs2/alloc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index f1cc8258d34a..b87960cdda0d 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -5941,7 +5941,7 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
 						 OCFS2_JOURNAL_ACCESS_WRITE);
 		if (status < 0) {
 			mlog_errno(status);
-			goto bail;
+			goto bail_commit;
 		}
 
 		tl->tl_used = cpu_to_le16(i);
@@ -5965,7 +5965,7 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
 						     num_clusters);
 			if (status < 0) {
 				mlog_errno(status);
-				goto bail;
+				goto bail_commit;
 			}
 		}
 
@@ -5975,6 +5975,8 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
 
 	osb->truncated_clusters = 0;
 
+bail_commit:
+	ocfs2_commit_trans(osb, handle);
 bail:
 	return status;
 }
-- 
2.17.1


_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

             reply	other threads:[~2021-09-08  6:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-08  6:26 Chenyuan Mi [this message]
2021-09-08  6:26 ` [Ocfs2-devel] [PATCH] ocfs2: Fix handle refcount leak in two exception handling paths Chenyuan Mi
2021-09-08  9:05 ` Joseph Qi
2021-09-08  9:05   ` [Ocfs2-devel] " Joseph Qi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210908062603.6723-1-cymi20@fudan.edu.cn \
    --to=cymi20@fudan.edu.cn \
    --cc=jlbec@evilplan.org \
    --cc=joseph.qi@linux.alibaba.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark@fasheh.com \
    --cc=ocfs2-devel@oss.oracle.com \
    --cc=tanxin.ctf@gmail.com \
    --cc=xiyuyang19@fudan.edu.cn \
    --cc=yuanxzhang@fudan.edu.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.