Skip to contentSkip to conversation

e2fsprogs: fix flag settings in e2image.h

PATCH Applied Tomas Racek 3 participants 4 messages Feb 21, 2013 – Apr 22, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 e2fsprogs: fix flag settings in e2image.h

This prevents from SIGSEGV when -s options is used.

---
 lib/ext2fs/e2image.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/ext2fs/e2image.h +1 -1
index c918529..5537980 100644
@@ -19,7 +19,7 @@
 /* Image flags */
 #define E2IMAGE_INSTALL_FLAG	1
 #define E2IMAGE_SCRAMBLE_FLAG	2
-#define E2IMAGE_IS_QCOW2_FLAG	3
+#define E2IMAGE_IS_QCOW2_FLAG	4
 
 struct ext2_image_hdr {
 	__u32	magic_number;	/* This must be EXT2_ET_MAGIC_E2IMAGE */
Signature · 1 line
1.7.11.7
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Tomas Racek

Date: Thu, 21 Feb 2013 13:06:58 +0100
From: Tomas Racek <[email protected]>
To: [email protected]
Cc: Tomas Racek <[email protected]>
Subject: [PATCH] e2fsprogs: fix flag settings in e2image.h

This prevents from SIGSEGV when -s options is used.

oops! Thanks for catching that. I just wonder why the regression test is not catching that ?

you can add

Quoted 20 lines
---
 lib/ext2fs/e2image.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/ext2fs/e2image.h +1 -1
index c918529..5537980 100644
@@ -19,7 +19,7 @@
 /* Image flags */
 #define E2IMAGE_INSTALL_FLAG	1
 #define E2IMAGE_SCRAMBLE_FLAG	2
-#define E2IMAGE_IS_QCOW2_FLAG	3
+#define E2IMAGE_IS_QCOW2_FLAG	4
 
 struct ext2_image_hdr {
 	__u32	magic_number;	/* This must be EXT2_ET_MAGIC_E2IMAGE */
#2 lore raw

----- Original Message -----

Quoted 8 lines · Tomas Racek
Quoted 7 lines

Date: Thu, 21 Feb 2013 13:06:58 +0100
From: Tomas Racek <[email protected]>
To: [email protected]
Cc: Tomas Racek <[email protected]>
Subject: [PATCH] e2fsprogs: fix flag settings in e2image.h

Quoted 4 lines
Quoted 1 line

This prevents from SIGSEGV when -s options is used.

oops! Thanks for catching that. I just wonder why the regression test is not catching that ?

Well, it seems that "-s" option is not tested (or even used). I'll try to fix at least the first thing. ;-)

Tom

Quoted 27 lines

you can add

Quoted 20 lines
---
 lib/ext2fs/e2image.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/ext2fs/e2image.h +1 -1
index c918529..5537980 100644
@@ -19,7 +19,7 @@
 /* Image flags */
 #define E2IMAGE_INSTALL_FLAG	1
 #define E2IMAGE_SCRAMBLE_FLAG	2
-#define E2IMAGE_IS_QCOW2_FLAG	3
+#define E2IMAGE_IS_QCOW2_FLAG	4
 
 struct ext2_image_hdr {
 	__u32	magic_number;	/* This must be EXT2_ET_MAGIC_E2IMAGE */