9pfs: fix inode sequencing in 'synth' driver
PATCH 1/1 9pfs: fix inode sequencing in 'synth' driver
The 'synth' driver's root node and the 'synth' driver's first subdirectory node falsely share the same inode number (zero), which makes it impossible for 9p clients (i.e. 9p test cases) to distinguish root node and first subdirectory from each other by comparing their QIDs (which are derived by 9p server from driver's inode numbers).
Fix this issue by using prefix-increment instead of postfix-increment operator while generating new inode numbers for subdirectories and files.
--- hw/9pfs/9p-synth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/9pfs/9p-synth.c +2 -2
@@ -92,7 +92,7 @@ int qemu_v9fs_synth_mkdir(V9fsSynthNode *parent, int mode, } }/* Add the name */ - node =v9fs_add_dir_node (parent, mode, name,NULL , synth_node_count++); + node =v9fs_add_dir_node (parent, mode, name,NULL , ++synth_node_count);v9fs_add_dir_node (node, parent->attr->mode,".." , parent->attr, parent->attr->inode); v9fs_add_dir_node(node, node->attr->mode, ".",
@@ -130,7 +130,7 @@ int qemu_v9fs_synth_add_file(V9fsSynthNode *parent, int mode, mode = ((mode &0777 ) |S_IFREG ); node =g_malloc0 (sizeof (V9fsSynthNode)); node->attr = &node->actual_attr; - node->attr->inode = synth_node_count++; + node->attr->inode = ++synth_node_count; node->attr->nlink =1 ; node->attr->read = read; node->attr->write = write;
Signature · 1 line
2.30.2
Quoted 6 lines · On Mon, 14 Mar 2022 19:58:11 +0100 Christian Schoenebeck…
The 'synth' driver's root node and the 'synth' driver's first subdirectory node falsely share the same inode number (zero), which makes it impossible for 9p clients (i.e. 9p test cases) to distinguish root node and first subdirectory from each other by comparing their QIDs (which are derived by 9p server from driver's inode numbers).
Quoted 6 lines
Fix this issue by using prefix-increment instead of postfix-increment operator while generating new inode numbers for subdirectories and files.
Signed-off-by Christian Schoenebeck <[email protected]>---
Good catch !
Quoted 25 lines
hw/9pfs/9p-synth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/9pfs/9p-synth.c +2
-2@@ -92,7 +92,7 @@ int qemu_v9fs_synth_mkdir(V9fsSynthNode *parent, int mode, } }/* Add the name */ - node =v9fs_add_dir_node (parent, mode, name,NULL , synth_node_count++); + node =v9fs_add_dir_node (parent, mode, name,NULL , ++synth_node_count);v9fs_add_dir_node (node, parent->attr->mode,".." , parent->attr, parent->attr->inode); v9fs_add_dir_node(node, node->attr->mode, ".",@@ -130,7 +130,7 @@ int qemu_v9fs_synth_add_file(V9fsSynthNode *parent, int mode, mode = ((mode &0777 ) |S_IFREG ); node =g_malloc0 (sizeof (V9fsSynthNode)); node->attr = &node->actual_attr; - node->attr->inode = synth_node_count++; + node->attr->inode = ++synth_node_count; node->attr->nlink =1 ; node->attr->read = read; node->attr->write = write;
Quoted 12 lines · On Mittwoch, 16. März 2022 12:10:43 CET Greg Kurz wrote:
On Mon, 14 Mar 2022 19:58:11 +0100
Quoted 9 lines · Christian Schoenebeck
The 'synth' driver's root node and the 'synth' driver's first subdirectory node falsely share the same inode number (zero), which makes it impossible for 9p clients (i.e. 9p test cases) to distinguish root node and first subdirectory from each other by comparing their QIDs (which are derived by 9p server from driver's inode numbers).
Fix this issue by using prefix-increment instead of postfix-increment operator while generating new inode numbers for subdirectories and files.
Quoted 7 lines
Quoted 3 lines
Signed-off-by Christian Schoenebeck <[email protected]>---
Good catch !
Reviewed-by Greg Kurz <[email protected]>
Queued on 9p.next:
https://github.com/cschoenebeck/qemu/commits/9p.next
Thanks!
Best regards,
Christian Schoenebeck