From 891dea4f00c44cda9a3437da45683d96db69a33c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Jun 2011 11:19:19 +0300 Subject: [PATCH] mkfs.btrfs: return some defined value instead of garbage when lookup checksum ==31873== Command: ./mkfs.btrfs -r /some/root/ ==31873== Parent PID: 31872 ==31873== ==31873== Conditional jump or move depends on uninitialised value(s) ==31873== at 0x42C3D0: add_file_items (mkfs.c:792) ==31873== by 0x42CAB3: traverse_directory (mkfs.c:948) ==31873== by 0x42CF11: make_image (mkfs.c:1047) ==31873== by 0x42DE53: main (mkfs.c:1401) ==31873== Uninitialised value was created by a stack allocation ==31873== at 0x41B1B1: btrfs_csum_file_block (file-item.c:195) 'ret' value was not initialized for 'found' branch. The same fix sits in kernel: > commit 639cb58675ce9b507eed9c3d6b3335488079b21a > Author: Chris Mason > Date: Thu Aug 28 06:15:25 2008 -0400 > > Btrfs: Fix variable init during csum creation > > Signed-off-by: Chris Mason Signed-off-by: Sergei Trofimovich Signed-off-by: Hugo Mills --- file-item.c | 1 + 1 file changed, 1 insertion(+) diff --git a/file-item.c b/file-item.c index 9732282..47f6ad2 100644 --- a/file-item.c +++ b/file-item.c @@ -218,6 +218,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans, item = btrfs_lookup_csum(trans, root, path, bytenr, 1); if (!IS_ERR(item)) { leaf = path->nodes[0]; + ret = 0; goto found; } ret = PTR_ERR(item); -- 2.7.4