Преглед изворни кода

nilfs2: fix imperfect completion wait in nilfs_wait_on_logs

nilfs_wait_on_logs has a potential to slip out before completion of
all bio requests when it met an error.  This synchronization fault may
cause unexpected results, for instance, violative access to freed
segment buffers from an end-bio callback routine.

This fixes the issue by ensuring that nilfs_wait_on_logs waits all
given logs.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Ryusuke Konishi пре 15 година
родитељ
комит
d067633b44
1 измењених фајлова са 4 додато и 4 уклоњено
  1. 4 4
      fs/nilfs2/segbuf.c

+ 4 - 4
fs/nilfs2/segbuf.c

@@ -323,14 +323,14 @@ int nilfs_write_logs(struct list_head *logs, struct the_nilfs *nilfs)
 int nilfs_wait_on_logs(struct list_head *logs)
 int nilfs_wait_on_logs(struct list_head *logs)
 {
 {
 	struct nilfs_segment_buffer *segbuf;
 	struct nilfs_segment_buffer *segbuf;
-	int err;
+	int err, ret = 0;
 
 
 	list_for_each_entry(segbuf, logs, sb_list) {
 	list_for_each_entry(segbuf, logs, sb_list) {
 		err = nilfs_segbuf_wait(segbuf);
 		err = nilfs_segbuf_wait(segbuf);
-		if (err)
-			return err;
+		if (err && !ret)
+			ret = err;
 	}
 	}
-	return 0;
+	return ret;
 }
 }
 
 
 /*
 /*