btrfs-progs: subvol list: fix accidental trimming of subvolume name

kdave · kdave · commit 061e156eb43d · 2024-06-25T16:03:53.000+02:00
Commit 4db9259 ("btrfs-progs: use strncpy_null everywhere") did not properly convert the subvolume name copying to strncpy_null() and trimmed the last character. Issue: #829 Signed-off-by: David Sterba <dsterba@suse.com>
diff --git a/cmds/subvolume-list.c b/cmds/subvolume-list.c
@@ -547,7 +547,7 @@ static int update_root(struct rb_root *root_lookup,
 			error_msg(ERROR_MSG_MEMORY, NULL);
 			exit(1);
 		}
-		strncpy_null(ri->name, name, name_len);
+		strncpy_null(ri->name, name, name_len + 1);
 	}
 	if (ref_tree)
 		ri->ref_tree = ref_tree;
@@ -618,7 +618,7 @@ static int add_root(struct rb_root *root_lookup,
 			error_msg(ERROR_MSG_MEMORY, NULL);
 			exit(1);
 		}
-		strncpy_null(ri->name, name, name_len);
+		strncpy_null(ri->name, name, name_len + 1);
 	}
 	if (ref_tree)
 		ri->ref_tree = ref_tree;

Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ static int update_root(struct rb_root *root_lookup,`
`547`	`547`	`error_msg(ERROR_MSG_MEMORY, NULL);`
`548`	`548`	`exit(1);`
`549`	`549`	`}`
`550`		`- strncpy_null(ri->name, name, name_len);`
	`550`	`+ strncpy_null(ri->name, name, name_len + 1);`
`551`	`551`	`}`
`552`	`552`	`if (ref_tree)`
`553`	`553`	`ri->ref_tree = ref_tree;`
`@@ -618,7 +618,7 @@ static int add_root(struct rb_root *root_lookup,`
`618`	`618`	`error_msg(ERROR_MSG_MEMORY, NULL);`
`619`	`619`	`exit(1);`
`620`	`620`	`}`
`621`		`- strncpy_null(ri->name, name, name_len);`
	`621`	`+ strncpy_null(ri->name, name, name_len + 1);`
`622`	`622`	`}`
`623`	`623`	`if (ref_tree)`
`624`	`624`	`ri->ref_tree = ref_tree;`