libxl: update flex output files for DSA 3653-2

PATCH In review Wei Liu 2 participants 3 messages Sep 5, 2016

Share & tools

Wei Liu

author

2016-09-05 09:21 UTC #0 lore raw

PATCH 1/1 libxl: update flex output files for DSA 3653-2

We updated flex output files in 4b314c89 ("libxl: update flex output files") for DSA 3653-1 / CVE-2016-6354. But Debian security team discovered the fix to flex was incomplete and issued DSA 3653-2. We need to update our flex output files accordingly.

Signed-off-by Wei Liu <[email protected]>

---
Cc: Ian Jackson <[email protected]>

---
 tools/libxl/libxlu_cfg_l.c  | 4 ++--
 tools/libxl/libxlu_disk_l.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

tools/libxl/libxlu_cfg_l.c +2 -2

index 7fedd41..099aa8e 100644
@@ -685,7 +685,7 @@ static int input (yyscan_t yyscanner );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \

@@ -698,7 +698,7 @@ static int input (yyscan_t yyscanner );
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \

tools/libxl/libxlu_disk_l.c +2 -2

index 06f839e..54160ca 100644
@@ -1158,7 +1158,7 @@ static int input (yyscan_t yyscanner );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \

@@ -1171,7 +1171,7 @@ static int input (yyscan_t yyscanner );
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+		while ( (result = fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \

Signature · 7 lines

2.1.4


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Ian Jackson

Acked-by on v1 1/1

2016-09-05 10:24 UTC #1 lore raw

Wei Liu writes ("[PATCH] libxl: update flex output files for DSA 3653-2"):

Quoted 4 lines

We updated flex output files in 4b314c89 ("libxl: update flex output files") for DSA 3653-1 / CVE-2016-6354. But Debian security team discovered the fix to flex was incomplete and issued DSA 3653-2. We need to update our flex output files accordingly.

*sigh*

Acked-by Ian Jackson <[email protected]>

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Wei Liu

author

2016-09-05 10:54 UTC #2 lore raw

Quoted 9 lines · Ian Jackson

Wei Liu writes ("[PATCH] libxl: update flex output files for DSA 3653-2"):
Quoted 4 lines
We updated flex output files in 4b314c89 ("libxl: update flex output files") for DSA 3653-1 / CVE-2016-6354. But Debian security team discovered the fix to flex was incomplete and issued DSA 3653-2. We need to update our flex output files accordingly.
*sigh*
Acked-by Ian Jackson <[email protected]>

Pushed. Thanks.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel