]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
restripe: fix ignoring return value of ‘read’ and lseek
authorGuoqing Jiang <guoqing.jiang@cloud.ionos.com>
Mon, 18 May 2020 21:53:36 +0000 (23:53 +0200)
committerJes Sorensen <jsorensen@fb.com>
Tue, 19 May 2020 00:24:29 +0000 (20:24 -0400)
Got below error when run "make everything".

restripe.c: In function ‘test_stripes’:
restripe.c:870:4: error: ignoring return value of ‘read’, declared with attribute warn_unused_result [-Werror=unused-result]
    read(source[i], stripes[i], chunk_size);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Fix it by check the return value of ‘read’, and free memory
in the failure case.

And check the return value of lseek as well per Jes's comment.

Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
restripe.c

index 31b07e89f318191ec97c39bda899dedbd7d2fbf6..86e1d00b0719e44634b825b087d5a4eac5ef9d28 100644 (file)
@@ -866,8 +866,16 @@ int test_stripes(int *source, unsigned long long *offsets,
                int disk;
 
                for (i = 0 ; i < raid_disks ; i++) {
-                       lseek64(source[i], offsets[i]+start, 0);
-                       read(source[i], stripes[i], chunk_size);
+                       if ((lseek64(source[i], offsets[i]+start, 0) < 0) ||
+                           (read(source[i], stripes[i], chunk_size) !=
+                            chunk_size)) {
+                               free(q);
+                               free(p);
+                               free(blocks);
+                               free(stripes);
+                               free(stripe_buf);
+                               return -1;
+                       }
                }
                for (i = 0 ; i < data_disks ; i++) {
                        int disk = geo_map(i, start/chunk_size, raid_disks,