瀏覽代碼

UBI: release locks in check_corruption

Commit 45aafd32996e27 "UBI: tighten the corrupted PEB criteria"
introduced some return paths that didn't release the ubi->buf_mutex

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Dan Carpenter 14 年之前
父節點
當前提交
1b1d76e2df
共有 1 個文件被更改,包括 9 次插入7 次删除
  1. 9 7
      drivers/mtd/ubi/scan.c

+ 9 - 7
drivers/mtd/ubi/scan.c

@@ -787,16 +787,15 @@ static int check_corruption(struct ubi_device *ubi, struct ubi_vid_hdr *vid_hdr,
 		 * erased, so it became unstable and corrupted, and should be
 		 * erased, so it became unstable and corrupted, and should be
 		 * erased.
 		 * erased.
 		 */
 		 */
-		return 0;
+		err = 0;
+		goto out_unlock;
 	}
 	}
 
 
 	if (err)
 	if (err)
-		return err;
+		goto out_unlock;
 
 
-	if (ubi_check_pattern(ubi->peb_buf1, 0xFF, ubi->leb_size)) {
-		mutex_unlock(&ubi->buf_mutex);
-		return 0;
-	}
+	if (ubi_check_pattern(ubi->peb_buf1, 0xFF, ubi->leb_size))
+		goto out_unlock;
 
 
 	ubi_err("PEB %d contains corrupted VID header, and the data does not "
 	ubi_err("PEB %d contains corrupted VID header, and the data does not "
 		"contain all 0xFF, this may be a non-UBI PEB or a severe VID "
 		"contain all 0xFF, this may be a non-UBI PEB or a severe VID "
@@ -806,8 +805,11 @@ static int check_corruption(struct ubi_device *ubi, struct ubi_vid_hdr *vid_hdr,
 		pnum, ubi->leb_start, ubi->leb_size);
 		pnum, ubi->leb_start, ubi->leb_size);
 	ubi_dbg_print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
 	ubi_dbg_print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
 			       ubi->peb_buf1, ubi->leb_size, 1);
 			       ubi->peb_buf1, ubi->leb_size, 1);
+	err = 1;
+
+out_unlock:
 	mutex_unlock(&ubi->buf_mutex);
 	mutex_unlock(&ubi->buf_mutex);
-	return 1;
+	return err;
 }
 }
 
 
 /**
 /**