Add infinite loop checking in img_create()
cover Add infinite loop checking in img_create()
From: Xu Wang <[email protected]>
If user creates a image with loop in backing file, qemu doesn't give any warning or error report and creation successful. If this image was opend by qemu, no response would occure and segment fault would happend at last. Hence these patches refine and export infinite loop checking in collect_image_info_list() and add checking into img_create(). If a loop would occure, an error info output and creation interrupted.
Xu Wang (2):
Refine and export infinite loop checking in collect_image_info_list() Check infinite loop in img_create()
qemu-img.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 100 insertions(+), 21 deletions(-)
Signature · 1 line
1.8.1.4
PATCH 1/2 Refine and export infinite loop checking in collect_image_info_list()
From: Xu Wang <[email protected]>
--- qemu-img.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 89 insertions(+), 21 deletions(-)
qemu-img.c +89 -21
@@ -324,6 +324,86 @@ static int add_old_style_options(const char *fmt, QEMUOptionParameter *list,return 0 ; } +static gboolean str_equal_func (gconstpointer a,gconstpointer b) +{ +return strcmp (a, b) ==0 ; +} + +/** +* Check backing file chain if there is a loop in it and build list of +* ImageInfo if needed. +* +* @filename: topmost image filename +* @fmt: topmost image format (may be NULL to autodetect) +* @head: head of ImageInfo list. If not need please set head to null. +* @chain: true - enumerate entire backing file chain +* false - only topmost image file +* @backing_file: if this value is set, filename will insert into hash +* table directly. open and seek backing file start from it. +* +* If return true, stands for a backing file loop exists or some error +* happend. If return false, everything is ok. +*/ +static bool backing_file_loop_check (const char *filename,const char *fmt, +bool chain,const char *backing_file) { +GHashTable *filenames; +BlockDriverState *bs; +ImageInfo *info; +Error *err =NULL ; + + filenames =g_hash_table_new_full (g_str_hash, str_equal_func,NULL ,NULL ); + +/* If backing file exists, filename will insert into hash table and seek +* the whole backing file chain from @backing_file. +*/ +if (backing_file) { +g_hash_table_insert (filenames, (gpointer )filename,NULL ); + filename = backing_file; + } + +while (filename) { +if (g_hash_table_lookup_extended (filenames, filename,NULL ,NULL )) { +error_report ("Backing file '%s' creates an infinite loop." , + filename); + goto err; + } +g_hash_table_insert (filenames, (gpointer )filename,NULL ); + + bs =bdrv_new_open (filename, fmt,BDRV_O_FLAGS |BDRV_O_NO_BACKING , + false, false); +if (!bs) { + goto err; + } + +bdrv_query_image_info (bs, &info, &err); +if (error_is_set (&err)) { +error_report ("%s" ,error_get_pretty (err)); +error_free (err); + goto err; + } + +bdrv_delete (bs); + + filename = fmt =NULL ; +if (chain) { +if (info->has_full_backing_filename) { + filename = info->full_backing_filename; + }else if (info->has_backing_filename) { + filename = info->backing_filename; + } +if (info->has_backing_filename_format) { + fmt = info->backing_filename_format; + } + } + } +g_hash_table_destroy (filenames); +return false; + +err: +g_hash_table_destroy (filenames); +return true; +} +static int img_create (int argc,char **argv) {int c;
@@ -1620,11 +1700,6 @@ static void dump_human_image_info_list(ImageInfoList *list) } } -static gboolean str_equal_func (gconstpointer a,gconstpointer b) -{ -return strcmp (a, b) ==0 ; -} -/** * Open an image file chain and return an ImageInfoList *
@@ -1642,24 +1717,18 @@ static ImageInfoList *collect_image_info_list(const char *filename, bool chain) {ImageInfoList *head =NULL ; +BlockDriverState *bs; +ImageInfoList *elem;ImageInfoList **last = &head; -GHashTable *filenames; +ImageInfo *info;Error *err =NULL ; - - filenames =g_hash_table_new_full (g_str_hash, str_equal_func,NULL ,NULL ); + +/* check if loop exists and build ImageInfoList */ +if (backing_file_loop_check (filename, fmt, chain,NULL )) { + goto err; + }while (filename) { -BlockDriverState *bs; -ImageInfo *info; -ImageInfoList *elem; - -if (g_hash_table_lookup_extended (filenames, filename,NULL ,NULL )) { -error_report ("Backing file '%s' creates an infinite loop." , - filename); - goto err; - } -g_hash_table_insert (filenames, (gpointer )filename,NULL ); - bs =bdrv_new_open (filename, fmt,BDRV_O_FLAGS |BDRV_O_NO_BACKING , false, false);if (!bs) {
@@ -1692,12 +1761,11 @@ static ImageInfoList *collect_image_info_list(const char *filename, } } } -g_hash_table_destroy (filenames); +return head; err:qapi_free_ImageInfoList (head); -g_hash_table_destroy (filenames);return NULL ; }
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH 1/2] Refine and export infinite loop checking in collect_image_info_list()
Quoted 8 lines · Xu Wang
From: Xu Wang <[email protected]>
Signed-off-by Xu Wang <[email protected]>--- qemu-img.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 89 insertions(+), 21 deletions(-)
Quoted 5 lines
+/**
+ * Check backing file chain if there is a loop in it and build list of
+ * ImageInfo if needed.
+ *
+ * @filename: topmost image filename
absolute? relative?
Quoted 9 lines
+ * @fmt: topmost image format (may be NULL to autodetect)
+ * @head: head of ImageInfo list. If not need please set head to null.
+ * @chain: true - enumerate entire backing file chain
+ * false - only topmost image file
+ * @backing_file: if this value is set, filename will insert into hash
+ * table directly. open and seek backing file start from it.
+ *
+ * If return true, stands for a backing file loop exists or some error
+ * happend. If return false, everything is ok.
s/happend/happened/
qemu-img.c static int add_old_style_options(const char *fmt, QEMUOptionParameter *list, · line 348
Quoted 3 lines
+ */
qemu-img.c +2
-0+static bool backing_file_loop_check (const char *filename,const char *fmt, +bool chain,const char *backing_file) {
Indentation is off.
qemu-img.c static int add_old_style_options(const char *fmt, QEMUOptionParameter *list, · line 360
Quoted 12 lines
qemu-img.c +12
-0+GHashTable *filenames; +BlockDriverState *bs; +ImageInfo *info; +Error *err =NULL ; + + filenames =g_hash_table_new_full (g_str_hash, str_equal_func,NULL ,NULL ); + +/* If backing file exists, filename will insert into hash table and seek +* the whole backing file chain from @backing_file. +*/ +if (backing_file) { +g_hash_table_insert (filenames, (gpointer )filename,NULL );
Does this have any false positives (perhaps mishandling due to relative names) or false negatives (perhaps hard links allow different spellings of the same file to create a loop, although the difference in names won't indicate the problem)? I'd really like to see you add a testcase before this patch gets committed, although I agree that a patch along these lines is worthwhile. For example, make sure the following chain is not rejected:
/dir1/base.img <- /dir1/wrap.img(relative backing 'base.img') <- /dir2/base.img (absolute backing '/dir1/base.img') <- /dir2/wrap.img(relative backing 'base.img')
whether opened in /dir2/ via relative name 'wrap.img' or absolute name '/dir2/wrap.img'. Likewise, make sure you can detect this loop:
create directory 'dir'
create './dir/b.img'
create './b.img' with relative backing 'dir/b.img' remove ./dir/b.img and dir
ln -s . dir
now 'b.img' refers to itself as backing file, even though the names ./b.img and ./dir/b.img are not equal by strcmp.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [PATCH 1/2] Refine and export infinite loop checking in collect_image_info_list()
Quoted 24 lines · Eric Blake
qemu-img.c static int add_old_style_options(const char *fmt, QEMUOptionParameter *list, · line 360
Quoted 7 lines · Xu Wang
qemu-img.c +7
-0+ filenames =g_hash_table_new_full (g_str_hash, str_equal_func,NULL ,NULL ); + +/* If backing file exists, filename will insert into hash table and seek +* the whole backing file chain from @backing_file. +*/ +if (backing_file) { +g_hash_table_insert (filenames, (gpointer )filename,NULL );Does this have any false positives (perhaps mishandling due to relative names) or false negatives (perhaps hard links allow different spellings of the same file to create a loop, although the difference in names won't indicate the problem)? I'd really like to see you add a testcase before this patch gets committed, although I agree that a patch along these lines is worthwhile. For example, make sure the following chain is not rejected:
/dir1/base.img <- /dir1/wrap.img(relative backing 'base.img') <- /dir2/base.img (absolute backing '/dir1/base.img') <- /dir2/wrap.img(relative backing 'base.img')
whether opened in /dir2/ via relative name 'wrap.img' or absolute name '/dir2/wrap.img'. Likewise, make sure you can detect this loop:
Quoted 7 lines
create directory 'dir'
create './dir/b.img'
create './b.img' with relative backing 'dir/b.img' remove ./dir/b.img and dir
ln -s . dir
now 'b.img' refers to itself as backing file, even though the names ./b.img and ./dir/b.img are not equal by strcmp.
Yes, a test case should be added in tests/qemu-iotests/. Please see this wiki page for documentation:
http://qemu-project.org/Documentation/QemuIoTests
Stefan
Re: [Qemu-devel] [PATCH 1/2] Refine and export infinite loop checking in collect_image_info_list()
In reply to Eric Blake2013/6/29 Eric Blake <[email protected]>
Quoted 10 lines · Xu Wang
Quoted 5 lines
From: Xu Wang <[email protected]>
Signed-off-by Xu Wang <[email protected]>--- qemu-img.c | 110+++++++++++++++++++++++++++++++++++++++++++++++++------------
Quoted 2 lines
1 file changed, 89 insertions(+), 21 deletions(-)
Quoted 8 lines
Quoted 5 lines
+/**
+ * Check backing file chain if there is a loop in it and build list of
+ * ImageInfo if needed.
+ *
+ * @filename: topmost image filenameabsolute? relative?
either is OK.
Quoted 7 lines
Quoted 7 lines
+ * @fmt: topmost image format (may be NULL to autodetect)
+ * @head: head of ImageInfo list. If not need please set head to null.
+ * @chain: true - enumerate entire backing file chain
+ * false - only topmost image file
+ * @backing_file: if this value is set, filename will insert into hash
+ * table directly. open and seek backing file start from
Quoted 7 lines
it.
Quoted 3 lines
+ *
+ * If return true, stands for a backing file loop exists or some error
+ * happend. If return false, everything is ok.s/happend/happened/
updated in V2
Quoted 38 lines
Quoted 3 lines
+ */
+static bool backing_file_loop_check(const char *filename, const char*fmt,
Quoted 1 line
+ bool chain, const char
*backing_file) {Indentation is off.
qemu-img.c static int add_old_style_options(const char *fmt, QEMUOptionParameter *list,
Quoted 6 lines
qemu-img.c +6
-0+GHashTable *filenames; +BlockDriverState *bs; +ImageInfo *info; +Error *err =NULL ; + + filenames = g_hash_table_new_full(g_str_hash, str_equal_func, NULL,NULL);
Review
Quoted 2 lines
(quoted diff) +2
-0+ + /* If backing file exists, filename will insert into hash table andseek
qemu-img.c static int add_old_style_options(const char *fmt, QEMUOptionParameter *list, · line 360
Quoted 4 lines
qemu-img.c +4
-0+* the whole backing file chain from @backing_file. +*/ +if (backing_file) { +g_hash_table_insert (filenames, (gpointer )filename,NULL );Does this have any false positives (perhaps mishandling due to relative names) or false negatives (perhaps hard links allow different spellings of the same file to create a loop, although the difference in names won't indicate the problem)? I'd really like to see you add a testcase before this patch gets committed, although I agree that a patch along these lines is worthwhile. For example, make sure the following chain is not rejected:
/dir1/base.img <- /dir1/wrap.img(relative backing 'base.img') <- /dir2/base.img (absolute backing '/dir1/base.img') <- /dir2/wrap.img(relative backing 'base.img')
whether opened in /dir2/ via relative name 'wrap.img' or absolute name '/dir2/wrap.img'. Likewise, make sure you can detect this loop:
Quoted 8 lines
create directory 'dir'
create './dir/b.img'
create './b.img' with relative backing 'dir/b.img' remove ./dir/b.img and dir
ln -s . dir
now 'b.img' refers to itself as backing file, even though the names ./b.img and ./dir/b.img are not equal by strcmp.
I did all test for my new version patch. It recognize the same file by inode instead
of filename.
Quoted 6 lines
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
PATCH 2/2 Check infinite loop in img_create()
In reply to Xu WangFrom: Xu Wang <[email protected]>
--- qemu-img.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
qemu-img.c +11 -0
@@ -415,6 +415,7 @@ static int img_create(int argc, char **argv)char *options =NULL ;Error *local_err =NULL ;bool quiet = false; +char backing_file[1024 ];for (;;) { c =getopt (argc, argv,"F:b:f:he6o:q" );
@@ -481,6 +482,16 @@ static int img_create(int argc, char **argv)return print_block_option_help (filename, fmt); } +/* check infinite loop in backing file chain */ +if (options) { +if (get_param_value (backing_file,sizeof (backing_file), +"backing_file" , options)) { +if (backing_file_loop_check (filename, fmt, true, backing_file)) { +return 1 ; + } + } + } +bdrv_img_create (filename, fmt, base_filename, base_fmt, options, img_size,BDRV_O_FLAGS , &local_err, quiet);if (error_is_set (&local_err)) {
Signature · 1 line
1.8.1.4
Am 27.06.2013 09:38, schrieb Xu Wang:
Quoted 9 lines
From: Xu Wang <[email protected]>
If user creates a image with loop in backing file, qemu doesn't give any warning or error report and creation successful. If this image was opend by qemu, no response would occure and segment fault would happend at last. Hence these patches refine and export infinite loop checking in
collect_image_info_list()and add checking intoimg_create(). If a loop would occure, an error info output and creation interrupted.
Quoted 3 lines
Xu Wang (2):
Refine and export infinite loop checking incollect_image_info_list()Check infinite loop inimg_create()
In the future please use a prefix such as "qemu-img: ..." on both cover letter and patches to indicate which part of code it concerns, and CC the respective maintainers of that area to assure appropriate review.
Regards,
Andreas
Quoted 4 lines
qemu-img.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 100 insertions(+), 21 deletions(-)
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Quoted 10 lines · Andreas Färber
Am 27.06.2013 09:38, schrieb Xu Wang:
Quoted 9 lines
From: Xu Wang <[email protected]>
If user creates a image with loop in backing file, qemu doesn't give any warning or error report and creation successful. If this image was opend by qemu, no response would occure and segment fault would happend at last. Hence these patches refine and export infinite loop checking in
collect_image_info_list()and add checking intoimg_create(). If a loop would occure, an error info output and creation interrupted.
Quoted 7 lines
Quoted 3 lines
Xu Wang (2):
Refine and export infinite loop checking incollect_image_info_list()Check infinite loop inimg_create()In the future please use a prefix such as "qemu-img: ..." on both cover letter and patches to indicate which part of code it concerns, and CC the respective maintainers of that area to assure appropriate review.
To find out who to Cc on patch emails, use:
$ scripts/get_maintainer.pl -f qemu-img.c
Stefan