Refine and export backing file loop check
v5 cover Refine and export backing file loop check
From: Xu Wang <[email protected]>
If there is loop exists in the backing file chain, many problems could be caused by it, such as no response and segment fault during system boot. Hence stopping backing file loop appear is very necessary. These patches refine and export loop checking function from collect_image_ info_list() to block.c and build a independent function named bdrv_ backing_file_loop_check(). Backing file loop checking is added before image created, before change backing file and before system boot.
Updates from V4:
1. Add backing file loop check in bdrv_new_open().
2. Adjust open file logic of collect_image_info_list() (bdrv_new_open() is called only once when opening the whole chain).
3. Remove redundant brackets in lnk file check logic.
4. Add error output in bdrv_img_create().
5. Remove MAX_PATH_LEN to use PATH_MAX instead.
Updates from V3:
1. Comments fix for function bdrv_backing_file_loop_check().
2. Add ret check for fseek()/fread() in get_lnk_target_file().
3. Add limit of shortcuts filename length reading during comparing.
4. Add error_report() in driv_init().
5. Remove redundant loop check in qcow2/qed_change_backing_file().
Updates from V2:
1. Removed parameter @chain from bdrv_backing_file_loop_check()
2. Comments and format fix, all patches were checked by checkpatch.pl
3. Fixed *bs leak.
4. Improved logic of .lnk file recognization.
5. Add filename lenth limit check in while()
6. Changed get_win_inode() to get_inode() and move all inode get method into it to make logic more simpler.
7. Added value of @fmt as suggested.
8. Added backing file loop check in qcow2.c/qed.c
Xu Wang (6):
block/qemu-img: Refine and export infinite loop checking in
collect_image_info_list()
qemu-img: Add infinite loop checking in bdrv_new_open()
block: Add WIN32 platform support for backing_file_loop_check()
block: Check infinite loop in bdrv_img_create()
block: Add backing file loop check in change_backing_file()
block: Add infinite loop check in drive_init()
block.c | 253 +++++++++++++++++++++++++++++++++++++++++++++++++- blockdev.c | 7 ++ include/block/block.h | 4 + qemu-img.c | 51 +++++----- 4 files changed, 284 insertions(+), 31 deletions(-)
Signature · 1 line
1.8.1.4
PATCH v5 1/6 block/qemu-img: Refine and export infinite loop checking in collect_image_info_list()
From: Xu Wang <[email protected]>
If there is a loop exists in the backing file chain, many problems could be caused by it, such as no response and segment fault during system boot. Hence stopping backing file loop appear is very necessary. This patch refine and export loop checking function from collect_image_ info_list() to block.c and build a independent function named bdrv_ backing_file_loop_check().
--- block.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 4 +++ qemu-img.c | 44 ++++++++++------------- 3 files changed, 118 insertions(+), 26 deletions(-)
block.c +96 -0
@@ -4433,6 +4433,102 @@ bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) bs->total_time_ns[cookie->type] +=get_clock () - cookie->start_time_ns; } +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. +* +* @filename: topmost image filename, absolute or relative path is OK. +* @fmt: topmost image format (may be NULL to autodetect) +* @backing_file: if this value is set, @filename inode (-1 if it doesn't +* exist) will insert into hash table directly. Loop check +* starts from it. Absolute or relative path is OK for it. +* @backing_format: format of backing file +* +* Returns: true for backing file loop or error happened, false for no loop. +*/ +bool bdrv_backing_file_loop_check (const char *filename,const char *fmt, +const char *backing_file, +const char *backing_format) { +GHashTable *inodes; +BlockDriverState *bs; +BlockDriver *drv; +struct stat sbuf; +long inode =0 ; +int ret; +char fbuf[1024 ]; + + inodes =g_hash_table_new_full (g_str_hash, str_equal_func,NULL ,NULL ); + +if (backing_file) { +/* Check if file exists. */ +if (access (filename,F_OK )) { + inode =-1 ; + }else { +if (stat (filename, &sbuf) ==-1 ) { +error_report ("Get file %s stat failed." , filename); + goto err; + } + inode = (long )sbuf.st_ino; + } + + filename = backing_file; + fmt = backing_format; +g_hash_table_insert (inodes, (gpointer)&inode,NULL ); + } + +while (filename && (filename[0 ] !='\0' )) { +if (stat (filename, &sbuf) ==-1 ) { +error_report ("Get file %s stat failed." , filename); + goto err; + } + inode = (long )sbuf.st_ino; + +if (g_hash_table_lookup_extended (inodes, &inode,NULL ,NULL )) { +error_report ("Backing file '%s' creates an infinite loop." , + filename); + goto err; + } +g_hash_table_insert (inodes, (gpointer)&inode,NULL ); + + bs =bdrv_new ("image" ); + +if (fmt) { + drv =bdrv_find_format (fmt); +if (!drv) { +error_report ("Unknown file format '%s'" , fmt); +bdrv_delete (bs); + goto err; + } + }else { + drv =NULL ; + } + + ret =bdrv_open (bs, filename,NULL , +BDRV_O_CACHE_WB |BDRV_O_NO_BACKING , drv); +if (ret <0 ) { +error_report ("Could not open '%s': %s" , filename,strerror (-ret)); +bdrv_delete (bs); + goto err; + } + +bdrv_get_backing_filename (bs, fbuf,sizeof (fbuf)); + filename = fbuf; + fmt =NULL ; + +bdrv_delete (bs); + } +g_hash_table_destroy (inodes); +return false; + +err: +g_hash_table_destroy (inodes); +return true; +} + void bdrv_img_create(const char *filename, const char *fmt, const char *base_filename, const char *base_fmt, char *options, uint64_t img_size, int flags,
include/block/block.h +4 -0
@@ -333,6 +333,10 @@ int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf,int bdrv_load_vmstate (BlockDriverState *bs,uint8_t *buf,int64_t pos,int size); +bool bdrv_backing_file_loop_check (const char *filename,const char *fmt, +const char *backing_file, +const char *backing_format); + void bdrv_img_create(const char *filename, const char *fmt, const char *base_filename, const char *base_fmt, char *options, uint64_t img_size, int flags,
qemu-img.c +18 -26
73 lines not on this page · raw message
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH V5 1/6] block/qemu-img: Refine and export infinite loop checking in collect_image_info_list()
Quoted 8 lines · Xu Wang
From: Xu Wang <[email protected]>
If there is a loop exists in the backing file chain, many problems could be caused by it, such as no response and segment fault during system boot. Hence stopping backing file loop appear is very necessary. This patch refine and export loop checking function from
collect_image_info_list()toblock.cand build a independent function namedbdrv_backing_file_loop_check().
Are we trying to get this series into 1.6 on the grounds that it fixes bugs? The grammar was a bit awkward; may I suggest:
If there is a loop in the backing file chain, it could cause problems such as no response or a segfault during system boot. Hence detecting a backing file loop is necessary. This patch extracts the loop check from collect_image_info_list() in block.c into an independent function bdrv_backing_file_loop_check().
Quoted 13 lines
Signed-off-by Xu Wang <[email protected]>--- block.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 4 +++ qemu-img.c | 44 ++++++++++------------- 3 files changed, 118 insertions(+), 26 deletions(-)block.c +3
-0+static gboolean str_equal_func (gconstpointer a,gconstpointer b) +{ +return strcmp (a, b) ==0 ;
block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4448
Quoted 10 lines
block.c +10
-0+} + +/** +* Check backing file chain if there is a loop in it. +* +* @filename: topmost image filename, absolute or relative path is OK. +* @fmt: topmost image format (may be NULL to autodetect) +* @backing_file: if this value is set, @filename inode (-1 if it doesn't +* exist) will insert into hash table directly. Loop check +* starts from it. Absolute or relative path is OK for it.
This is confusing - are we passing in a filename or an inode? At the parameter level, it doesn't matter what we hash or even that we have a hash table - just what we pass in. The choice of hashing an inode value is an internal detail.
Quoted 1 line
+ * @backing_format: format of backing file
Why do we need to pass in two filenames? I'm guessing it's because you want to detect TWO types of loops:
Loop 1 - we are creating a NEW file, but requesting a backing file name
- if anything in that backing file chain points to the file we are about to create, we would be creating a loop, and want to fail. That is, if we have an existing file "B" that points to a missing backing file "A", and we are now creating file "A" with a backing file of "B", we want the creation to fail because it would create a loop. But in this case, it is sufficient to note that "B" is a broken image (since "A" doesn't exist yet), so we don't have to do a loop check here, rather we can just merely test if "B" and its entire backing chain is reachable.
Loop 2 - we are testing if an EXISTING file has a loop. But the loop may not necessarily point back to our own file. That is, a file "A" with metadata that claims a backing file of "A" is a loop. Also, a file "A" with metadata that claims "B" as backing, and existing "B" with metadata that claims "A" as backing, is a loop. But we ALSO want to detect and reject a file "A" that claims "B" as backing, where an existing file "B" claims itself as backing; or even "A" claims "B", "B" claims "C", and "C" claims "B". Thus, we need to detect the loop no matter where in the chain it occurs, and realize that it does not necessarily point back to "A". So, why not just declare that we are starting with "A", without regards to it's backing file?
That is, I think your function signature is over-engineered - you really only need to pass in a single file name - that of an existing file, and have the file report success if all backing files can be resolved without hitting any loops in the resolution, and failure if any backing file is missing or if any backing file refers back to a point earlier in the chain.
Quoted 4 lines
+ *
+ * Returns: true for backing file loop or error happened, false for no loop.
+ */
+bool bdrv_backing_file_loop_check(const char *filename, const char *fmt,
Those return semantics are a bit unusual. A function named _check() that returns a bool usually returns true when the function passed. How will this function usually be called? Let's name it something that will avoid double-negatives; maybe:
bool bdrv_backing_chain_okay(const char *filename, const char *fmt)
which returns true if filename is safe to use as a backing chain.
block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4460
Quoted 7 lines
block.c +7
-0+const char *backing_file, + const char *backing_format) { + GHashTable *inodes; +BlockDriverState *bs; +BlockDriver *drv; +struct stat sbuf; +long inode =0 ;
You are not guaranteed that st_ino fits in a long; use ino_t. (IIRC, on 32-bit Cygwin, ino_t is 64-bit, but long is 32-bit)
block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4464
Quoted 4 lines
block.c +4
-0+int ret; +char fbuf[1024 ]; + + inodes =g_hash_table_new_full (g_str_hash, str_equal_func,NULL ,NULL );
So this says you are comparing by name (you are doing strcmp on the hashed data)...
Quoted 6 lines
block.c +6
-0+ +if (backing_file) { +/* Check if file exists. */ +if (access (filename,F_OK )) { + inode =-1 ; + }else {
block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4480
Quoted 10 lines
block.c +10
-0+if (stat (filename, &sbuf) ==-1 ) { +error_report ("Get file %s stat failed." , filename); + goto err; + } + inode = (long )sbuf.st_ino; + } + + filename = backing_file; + fmt = backing_format; +g_hash_table_insert (inodes, (gpointer)&inode,NULL );
...but here, you are shoving in integers cast as a name. strcmp() on integers will not work. Furthermore, inode alone is not guaranteed to be unique; you are only guaranteed that the combination of dev_t and ino_t form a unique identifier for any file (that is, you are prone to false collisions if two files on different devices happen to have the same inode).
I want to see loop detection working, but this patch still needs an overhaul before it can be considered working.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [PATCH V5 1/6] block/qemu-img: Refine and export infinite loop checking in collect_image_info_list()
Quoted 9 lines · Eric Blake
Quoted 8 lines · Xu Wang
From: Xu Wang<[email protected]>
If there is a loop exists in the backing file chain, many problems could be caused by it, such as no response and segment fault during system boot. Hence stopping backing file loop appear is very necessary. This patch refine and export loop checking function from
collect_image_info_list()toblock.cand build a independent function namedbdrv_backing_file_loop_check().
Quoted 8 lines
Are we trying to get this series into 1.6 on the grounds that it fixes bugs? The grammar was a bit awkward; may I suggest:
If there is a loop in the backing file chain, it could cause problems such as no response or a segfault during system boot. Hence detecting a backing file loop is necessary. This patch extracts the loop check from
collect_image_info_list()inblock.cinto an independent functionbdrv_backing_file_loop_check().
I am very sorry for working other works so long time and do not submit new version patches in time. Now I am rewriting them to improve their quality.
Quoted 17 lines
Quoted 17 lines
Signed-off-by Xu Wang<[email protected]>--- block.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 4 +++ qemu-img.c | 44 ++++++++++------------- 3 files changed, 118 insertions(+), 26 deletions(-)block.c +9
-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. +* +* @filename: topmost image filename, absolute or relative path is OK.
Quoted 8 lines
Quoted 4 lines
+ * @fmt: topmost image format (may be NULL to autodetect)
+ * @backing_file: if this value is set, @filename inode (-1 if it doesn't
+ * exist) will insert into hash table directly. Loop check
+ * starts from it. Absolute or relative path is OK for it.This is confusing - are we passing in a filename or an inode? At the parameter level, it doesn't matter what we hash or even that we have a hash table - just what we pass in. The choice of hashing an inode value is an internal detail.
In the new version I'll just pass filename and compare them to find loop.
Quoted 26 lines
Quoted 1 line
+ * @backing_format: format of backing file
Why do we need to pass in two filenames? I'm guessing it's because you want to detect TWO types of loops:
Loop 1 - we are creating a NEW file, but requesting a backing file name
- if anything in that backing file chain points to the file we are about to create, we would be creating a loop, and want to fail. That is, if we have an existing file "B" that points to a missing backing file "A", and we are now creating file "A" with a backing file of "B", we want the creation to fail because it would create a loop. But in this case, it is sufficient to note that "B" is a broken image (since "A" doesn't exist yet), so we don't have to do a loop check here, rather we can just merely test if "B" and its entire backing chain is reachable.Loop 2 - we are testing if an EXISTING file has a loop. But the loop may not necessarily point back to our own file. That is, a file "A" with metadata that claims a backing file of "A" is a loop. Also, a file "A" with metadata that claims "B" as backing, and existing "B" with metadata that claims "A" as backing, is a loop. But we ALSO want to detect and reject a file "A" that claims "B" as backing, where an existing file "B" claims itself as backing; or even "A" claims "B", "B" claims "C", and "C" claims "B". Thus, we need to detect the loop no matter where in the chain it occurs, and realize that it does not necessarily point back to "A". So, why not just declare that we are starting with "A", without regards to it's backing file?
Quoted 6 lines
That is, I think your function signature is over-engineered - you really only need to pass in a single file name - that of an existing file, and have the file report success if all backing files can be resolved without hitting any loops in the resolution, and failure if any backing file is missing or if any backing file refers back to a point earlier in the chain.
If we execute 'qemu-img create ...' command to create a new image and point set a backing file. I should check if there is loop exists in the backing file chain (as you said above). But this function also need to verify the new image to be created won't overwrite any one in the backing file chain. Because that will create a loop. If I check the whole chain after the new image created, it's too late to find the loop (if it exists) because some image has been overwrited. So is there any suggestion if I just pass one filename to the function? Thanks.
Quoted 4 lines
Quoted 4 lines
+ *
+ * Returns: true for backing file loop or error happened, false for no loop.
+ */
+bool bdrv_backing_file_loop_check(const char *filename, const char *fmt,
Quoted 8 lines
Those return semantics are a bit unusual. A function named
_check()that returns a bool usually returns true when the function passed. How will this function usually be called? Let's name it something that will avoid double-negatives; maybe:bool
bdrv_backing_chain_okay(const char *filename, const char *fmt)which returns true if filename is safe to use as a backing chain.
Good name. I'll change name of this function into it:-)
Quoted 10 lines
block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4460
Quoted 8 lines
block.c +7
-0+const char *backing_file, + const char *backing_format) { + GHashTable *inodes; +BlockDriverState *bs; +BlockDriver *drv; +struct stat sbuf; +long inode =0 ;You are not guaranteed that
st_inofits in a long; useino_t. (IIRC, on 32-bit Cygwin,ino_tis 64-bit, but long is 32-bit)
Sure. I'll update all points like this.
Quoted 6 lines
block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4464
Quoted 4 lines
block.c +4
-0+int ret; +char fbuf[1024 ]; + + inodes =g_hash_table_new_full (g_str_hash, str_equal_func,NULL ,NULL );So this says you are comparing by name (you are doing strcmp on the hashed data)...
Comparing by name is good choice. I'll update it in my new version.
Quoted 16 lines
Quoted 6 lines
block.c +6
-0+ +if (backing_file) { +/* Check if file exists. */ +if (access (filename,F_OK )) { + inode =-1 ; + }else {block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4480
Quoted 10 lines
block.c +10
-0+if (stat (filename, &sbuf) ==-1 ) { +error_report ("Get file %s stat failed." , filename); + goto err; + } + inode = (long )sbuf.st_ino; + } + + filename = backing_file; + fmt = backing_format; +g_hash_table_insert (inodes, (gpointer)&inode,NULL );
Quoted 8 lines
...but here, you are shoving in integers cast as a name.
strcmp()on integers will not work. Furthermore, inode alone is not guaranteed to be unique; you are only guaranteed that the combination ofdev_tandino_tform a unique identifier for any file (that is, you are prone to false collisions if two files on different devices happen to have the same inode).
I want to see loop detection working, but this patch still needs an overhaul before it can be considered working.
Thank you very much for your suggestions:-)
Xu Wang
PATCH v5 2/6 qemu-img: Add infinite loop checking in bdrv_new_open()
In reply to Xu WangFrom: Xu Wang <[email protected]>
Every image should be checked if there is infinite loop in backing file chain before open it. So infinite loop check was added into bdrv_new_open(). If @filename is opened with no flags BDRV_O_NO_BACKING, the infinite loop check should be called.
--- qemu-img.c | 7 +++++++ 1 file changed, 7 insertions(+)
qemu-img.c +7 -0
@@ -278,6 +278,13 @@ static BlockDriverState *bdrv_new_open(const char *filename, drv =NULL ; } +/* check backing file loop if the whole chain need to be opened */ +if (!(flags &BDRV_O_NO_BACKING ) && +bdrv_backing_file_loop_check (filename, fmt,NULL ,NULL )) { +error_report ("bdrv_new_open: Open %s failed." , filename); + goto fail; + } + ret =bdrv_open (bs, filename,NULL , flags, drv);if (ret <0 ) {error_report ("Could not open '%s': %s" , filename,strerror (-ret));
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH V5 2/6] qemu-img: Add infinite loop checking in bdrv_new_open()
Quoted 5 lines · Xu Wang
From: Xu Wang <[email protected]>
Every image should be checked if there is infinite loop in backing file chain before open it. So infinite loop check was added into
bdrv_new_open(). If @filename is opened with no flags
s/with no flags/without the flag/
Quoted 12 lines
BDRV_O_NO_BACKING, the infinite loop check should be called.Signed-off-by Xu Wang <[email protected]>--- qemu-img.c | 7 +++++++ 1 file changed, 7 insertions(+)qemu-img.c +0
-0
qemu-img.c static BlockDriverState *bdrv_new_open(const char *filename, · line 284
Quoted 7 lines
qemu-img.c +4
-0@@ -278,6 +278,13 @@ static BlockDriverState *bdrv_new_open(const char *filename, drv =NULL ; } +/* check backing file loop if the whole chain need to be opened */ +if (!(flags &BDRV_O_NO_BACKING ) && +bdrv_backing_file_loop_check (filename, fmt,NULL ,NULL )) { +error_report ("bdrv_new_open: Open %s failed." , filename);
Error messages generally don't end with '.'; also, this message seems to lack details that might be useful to the end user (we know that either the backing chain couldn't be completely followed or has a loop).
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
PATCH v5 3/6 block: Add WIN32 platform support for backing_file_loop_check()
In reply to Xu WangFrom: Xu Wang <[email protected]>
Method of get_inode is different between Linux and WIN32 plateform. This patch added inode caculate method on Windows plateform so that backing file check could work on Windows plateform.
--- block.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 148 insertions(+), 8 deletions(-)
block.c +148 -8
@@ -4433,6 +4433,147 @@ bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) bs->total_time_ns[cookie->type] +=get_clock () - cookie->start_time_ns; } +#ifdef _WIN32 +static int get_lnk_target_file (const char *lnk_file,char *filepath) +{ +unsigned int flag, offset; +unsigned int sflag; +char uch; +int i =0 ; + +FILE *fd =fopen (lnk_file,"rb" ); +if (!fd) { +error_report ("Open file %s failed." , lnk_file); +return -1 ; + } + +/* Check if the file is shortcuts by reading first 4 bytes if it's 0x4c */ +if (fread (&flag,4 ,1 , fd) !=1 ) { +error_report ("Read 0x4c field of %s failed." , lnk_file); + goto err; + } + +if (flag !=0x4c ) { +error_report ("%s is not a lnk file." , lnk_file); + goto err; + } + +/* Parse flags on offset 0x14 */ +if (fseek (fd,0x14 ,SEEK_SET )) { +error_report ("Seek flags of %s failed." , lnk_file); + goto err; + } + +if (fread (&flag,4 ,1 , fd) !=1 ) { +error_report ("Read flags of %s failed." , lnk_file); + goto err; + } + +/* seek to the length of item ID list */ +if (fseek (fd,0x4c ,SEEK_SET )) { +error_report ("Seek %s length of item ID list failed." , lnk_file); + goto err; + } + +/* Parse Shell item ID list */ +if (flag &0x01 ) { +/* Get the length of SHITEMID */ +if (fread (&sflag,2 ,1 , fd) !=1 ) { +error_report ("Read %s length of SHITEMID failed." , lnk_file); + goto err; + } + +/* Skip SHITEMID */ +if (fseek (fd, sflag,SEEK_CUR )) { +error_report ("Skip SHITEMID of %s failed." , lnk_file); + goto err; + } + } + + offset =ftell (fd); +if (offset ==-1 ) { +error_report ("ftell() of %s failed." , lnk_file); + goto err; + } +/* Read offset of local path */ +if (fseek (fd, offset +0x10 ,SEEK_SET )) { +error_report ("Seek offset of %s failed." , lnk_file); + goto err; + } +if (fread (&flag,4 ,1 , fd) !=1 ) { +error_report ("Read offset of %s failed." , lnk_file); + goto err; + } +/* Seek to the start of target file path */ +if (fseek (fd, flag + offset,SEEK_SET )) { +error_report ("Seek target file path of %s failed." , lnk_file); + goto err; + } + +do { +if (fread (&uch,1 ,1 , fd) !=1 ) { +error_report ("Read target path of %s failed." , lnk_file); + goto err; + } + filepath[i++] = uch; + }while ((i <=PATH_MAX ) && (uch !='\0' )); + +fclose (fd); +return 0 ; + +err: +fclose (fd); +return -1 ; +} +#endif + +static long get_inode (const char *filename) +{ +#ifdef _WIN32 +char pbuf[PATH_MAX +1 ], *p; +long inode; +struct stat sbuf; +char path[PATH_MAX +1 ]; +int len; + +/* If filename contains .lnk, it's a shortcuts. Target file +* need to be parsed. +*/ + len =strlen (filename); +if (len >4 && !strcmp (filename + len -4 ,".lnk" )) { +if (get_lnk_target_file (filename, path)) { +error_report ("Parse .lnk file %s failed." , filename); +return -1 ; + } + }else { +memcpy (path, filename,sizeof (filename)); + } + +if (stat (path, &sbuf) ==-1 ) { +error_report ("get file %s stat error." , path); +return -1 ; + } +if (GetFullPathName (path,PATH_MAX +1 , pbuf, &p) !=0 ) { + inode =11003 ; +for (p = pbuf; *p !='\0' ; p++) { + inode = inode *31 + *(unsigned char *)p; + } +return (inode *911 ) &0x7FFF ; + } + +return -1 ; +#else +struct stat sbuf; + +if (stat (filename, &sbuf) ==-1 ) { +error_report ("get file %s stat error." , filename); +return -1 ; + } + +return sbuf.st_ino; +#endif +} +static gboolean str_equal_func (gconstpointer a,gconstpointer b) {return strcmp (a, b) ==0 ;
@@ -4456,7 +4597,6 @@ bool bdrv_backing_file_loop_check(const char *filename, const char *fmt,GHashTable *inodes;BlockDriverState *bs;BlockDriver *drv; -struct stat sbuf;long inode =0 ;int ret;char fbuf[1024 ];
@@ -4468,11 +4608,11 @@ bool bdrv_backing_file_loop_check(const char *filename, const char *fmt,if (access (filename,F_OK )) { inode =-1 ; }else { -if (stat (filename, &sbuf) ==-1 ) { -error_report ("Get file %s stat failed." , filename); + inode =get_inode (filename); +if (inode ==-1 ) { +error_report ("Get file %s inode failed." , filename); goto err; } - inode = (long )sbuf.st_ino; } filename = backing_file;
@@ -4481,11 +4621,11 @@ bool bdrv_backing_file_loop_check(const char *filename, const char *fmt, }while (filename && (filename[0 ] !='\0' )) { -if (stat (filename, &sbuf) ==-1 ) { -error_report ("Get file %s stat failed." , filename); - goto err; + inode =get_inode (filename); +if (inode ==-1 ) { +error_report ("Get file %s inode failed." , filename); + goto err; } - inode = (long )sbuf.st_ino;if (g_hash_table_lookup_extended (inodes, &inode,NULL ,NULL )) { error_report("Backing file '%s' creates an infinite loop.",
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH V5 3/6] block: Add WIN32 platform support for backing_file_loop_check()
Quoted 3 lines · Xu Wang
From: Xu Wang <[email protected]>
Method of
get_inodeis different between Linux and WIN32 plateform.
s/plateform/platform/g (3 instances in the commit message)
Quoted 1 line
This patch added inode caculate method on Windows plateform so that
s/added/adds an/
s/caculate/calculation/
Quoted 11 lines
backing file check could work on Windows plateform.
Signed-off-by Xu Wang <[email protected]>--- block.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 148 insertions(+), 8 deletions(-)}
block.c +1
-0+#ifdef _WIN32
block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4446
Quoted 10 lines
block.c +10
-0+static int get_lnk_target_file (const char *lnk_file,char *filepath) +{ +unsigned int flag, offset; +unsigned int sflag; +char uch; +int i =0 ; + +FILE *fd =fopen (lnk_file,"rb" ); +if (!fd) { +error_report ("Open file %s failed." , lnk_file);
Error messages should not include '.'; also, when it is due to a system call failure, you should include strerror() information explaining the failure.
block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4452
Quoted 6 lines
block.c +6
-0+return -1 ; + } + +/* Check if the file is shortcuts by reading first 4 bytes if it's 0x4c */ +if (fread (&flag,4 ,1 , fd) !=1 ) { +error_report ("Read 0x4c field of %s failed." , lnk_file);
I don't know WIN32 programming well enough to know if this really how you should be checking for infinite loops. But how is this supposed to work? In POSIX, fopen() of a symlink opens its destination; to read a symlink's contents, you have to use readlink() (that is, the API used to read file contents is NOT the API used to chase link resolution). This whole function feels like a horrible hack, unlikely to do what you meant.
Review
Quoted 2 lines
(quoted diff) +2
-0+ +static long get_inode(const char *filename)
Again, 'long' and 'ino_t' are not necessarily compatible types. Use ino_t. And again, 'ino_t' alone does not uniquely designate a file; it is the combination of device and inode numbers together that give uniqueness.
block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4532
Quoted 2 lines
block.c +2
-0+{ +#ifdef _WIN32
We usually anchor # in the first column.
block.c bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) · line 4540
Quoted 8 lines
block.c +8
-0+char pbuf[PATH_MAX +1 ], *p; +long inode; +struct stat sbuf; +char path[PATH_MAX +1 ]; +int len; + +/* If filename contains .lnk, it's a shortcuts. Target file +* need to be parsed.
How does the rest of the qemu code base handle .lnk files? Are we trying to dereference the target file automatically? If so, is there already code that does that, which we can reuse here? It just seems awkward that you are implementing this from scratch - either we support reading through windows links (and should reuse that code) or we don't (and hence it doesn't matter if the user passes us a .lnk file, we aren't treating it any different than any other data file).
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
PATCH v5 4/6 block: Check infinite loop in bdrv_img_create()
In reply to Xu WangFrom: Xu Wang <[email protected]>
Backing file loop should be checked before qemu-img create command execution. If loop was found, qemu-img create should be stopped and an error was printed.
--- block.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
block.c +5 -5
@@ -4731,15 +4731,15 @@ void bdrv_img_create(const char *filename, const char *fmt, } backing_file =get_option_parameter (param,BLOCK_OPT_BACKING_FILE ); + backing_fmt =get_option_parameter (param,BLOCK_OPT_BACKING_FMT );if (backing_file && backing_file->value.s) { -if (!strcmp (filename, backing_file->value.s)) { -error_setg (errp,"Error: Trying to create an image with the " -"same filename as the backing file" ); +if (bdrv_backing_file_loop_check (filename, fmt, + backing_file->value.s, + backing_fmt->value.s)) { +error_report ("bdrv_img_create: loop exists, image create failed." ); goto out; } } - - backing_fmt =get_option_parameter (param,BLOCK_OPT_BACKING_FMT );if (backing_fmt && backing_fmt->value.s) { backing_drv =bdrv_find_format (backing_fmt->value.s);if (!backing_drv) {
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH V5 4/6] block: Check infinite loop in bdrv_img_create()
Quoted 4 lines · Xu Wang
From: Xu Wang <[email protected]>
Backing file loop should be checked before qemu-img create command execution. If loop was found, qemu-img create should be stopped and
s/was/is/ - commit messages should generally be in present tense (what the code is doing now that the patch is applied) not in past tense.
Quoted 1 line
an error was printed.
s/was //
Quoted 9 lines
Signed-off-by Xu Wang <[email protected]>--- block.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)backing_file = get_option_parameter(param, BLOCK_OPT_BACKING_FILE);
block.c void bdrv_img_create(const char *filename, const char *fmt, · line 4739
Quoted 9 lines
block.c +5
-3+ backing_fmt =get_option_parameter (param,BLOCK_OPT_BACKING_FMT );if (backing_file && backing_file->value.s) { -if (!strcmp (filename, backing_file->value.s)) { -error_setg (errp,"Error: Trying to create an image with the " -"same filename as the backing file" ); +if (bdrv_backing_file_loop_check (filename, fmt, + backing_file->value.s, + backing_fmt->value.s)) { +error_report ("bdrv_img_create: loop exists, image create failed." );
No '.' in error messages.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
PATCH v5 5/6 block: Add backing file loop check in change_backing_file()
In reply to Xu WangFrom: Xu Wang <[email protected]>
Backing file loop should be checked before calling change_backing_ file(). If loop appeared, this calling should be stopped and an error was printed.
--- block.c | 7 +++++++ 1 file changed, 7 insertions(+)
block.c +7 -0
@@ -1963,6 +1963,13 @@ int bdrv_change_backing_file(BlockDriverState *bs,return -EINVAL ; } +/* Check if loop exists in backing files chain after changed */ +if (bdrv_backing_file_loop_check (bs->filename, + bs->drv ? bs->drv->format_name :NULL , + backing_file, backing_fmt)) { +return -EIO ; + } +if (drv->bdrv_change_backing_file !=NULL ) { ret = drv->bdrv_change_backing_file (bs, backing_file, backing_fmt); }else {
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH V5 5/6] block: Add backing file loop check in change_backing_file()
Quoted 4 lines · Xu Wang
From: Xu Wang <[email protected]>
Backing file loop should be checked before calling
change_backing_file(). If loop appeared, this calling should be stopped and an
Breaking a function name across a line break is awkward.
Quoted 1 line
error was printed.
s/was //
Quoted 9 lines
Signed-off-by Xu Wang <[email protected]>--- block.c | 7 +++++++ 1 file changed, 7 insertions(+)+ /* Check if loop exists in backing files chain after changed */
s/changed/change/
But isn't that a bit late? Don't you want to check that a backing loop will not be created, prior to making the change?
Quoted 10 lines
block.c +6
-0+if (bdrv_backing_file_loop_check (bs->filename, + bs->drv ? bs->drv->format_name :NULL , + backing_file, backing_fmt)) { +return -EIO ; + } +if (drv->bdrv_change_backing_file !=NULL ) { ret = drv->bdrv_change_backing_file (bs, backing_file, backing_fmt); }else {
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
PATCH v5 6/6 block: Add infinite loop check in drive_init()
In reply to Xu WangFrom: Xu Wang <[email protected]>
Backing file should be checked if there is a loop in it during image boot. Becase if there is loop qemu would no response for a long time and segment fault occured. So this patch would check backing file chain if there is loop in it before open image.
--- blockdev.c | 7 +++++++ 1 file changed, 7 insertions(+)
blockdev.c +7 -0
@@ -695,6 +695,13 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)error_report ("warning: disabling copy_on_read on readonly drive" ); } +/* Add backing file loop check */ +if (bdrv_backing_file_loop_check (file, drv ? drv->format_name :NULL , +NULL ,NULL )) { +error_report ("drive_init: backing file loop check failed!" ); + goto err; + } + ret =bdrv_open (dinfo->bdrv, file, bs_opts, bdrv_flags, drv); bs_opts =NULL ;
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH V5 6/6] block: Add infinite loop check in drive_init()
Quoted 4 lines · Xu Wang
From: Xu Wang <[email protected]>
Backing file should be checked if there is a loop in it during image boot. Becase if there is loop qemu would no response for a long time
s/Becase/Because/
Quoted 1 line
and segment fault occured. So this patch would check backing file
s/occured/occurred/
Quoted 1 line
chain if there is loop in it before open image.
I'd suggest:
Check the backing file for a loop during image boot, to avoid a lack or response or segfault.
Quoted 11 lines
Signed-off-by Xu Wang <[email protected]>--- blockdev.c | 7 +++++++ 1 file changed, 7 insertions(+)blockdev.c +0
-0
blockdev.c DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) · line 701
Quoted 7 lines
blockdev.c +4
-0@@ -695,6 +695,13 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)error_report ("warning: disabling copy_on_read on readonly drive" ); } +/* Add backing file loop check */ +if (bdrv_backing_file_loop_check (file, drv ? drv->format_name :NULL , +NULL ,NULL )) { +error_report ("drive_init: backing file loop check failed!" );
The '!' seems a bit of overkill; it is sufficient to give an error message without trailing punctuation.
Quoted 7 lines
blockdev.c +3
-0+ goto err; + } + ret =bdrv_open (dinfo->bdrv, file, bs_opts, bdrv_flags, drv); bs_opts =NULL ;
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org