| 1 |
aballier 08/01/10 22:49:12 |
| 2 |
|
| 3 |
Modified: series |
| 4 |
Added: 340_all_format_string_injection_httpd.patch |
| 5 |
350_all_stack_based_overflow_subtitles.patch |
| 6 |
Log: |
| 7 |
add security backport patches |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 src/patchsets/vlc/0.8.6c/series |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/series?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/series?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/series?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: series |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/0.8.6c/series,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- series 22 Oct 2007 19:12:34 -0000 1.1 |
| 23 |
+++ series 10 Jan 2008 22:49:12 -0000 1.2 |
| 24 |
@@ -11,3 +11,5 @@ |
| 25 |
250_all_livepic.patch |
| 26 |
290_all_altivec.patch |
| 27 |
330_all_libdca.patch |
| 28 |
+340_all_format_string_injection_httpd.patch |
| 29 |
+350_all_stack_based_overflow_subtitles.patch |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 src/patchsets/vlc/0.8.6c/340_all_format_string_injection_httpd.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/340_all_format_string_injection_httpd.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/340_all_format_string_injection_httpd.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: 340_all_format_string_injection_httpd.patch |
| 39 |
=================================================================== |
| 40 |
Timestamp: 12/23/07 18:42:57 |
| 41 |
Author: courmisch |
| 42 |
Fix format string injection in the Connection field for HTTP-served files |
| 43 |
(affects HTTP interface and LUA plus HTTP export for DVB and RTP) |
| 44 |
|
| 45 |
Index: vlc-0.8.6d/src/network/httpd.c |
| 46 |
=================================================================== |
| 47 |
--- vlc-0.8.6d.orig/src/network/httpd.c |
| 48 |
+++ vlc-0.8.6d/src/network/httpd.c |
| 49 |
@@ -414,7 +414,7 @@ static int httpd_FileCallBack( httpd_cal |
| 50 |
psz_connection = httpd_MsgGet( &cl->query, "Connection" ); |
| 51 |
if( psz_connection != NULL ) |
| 52 |
{ |
| 53 |
- httpd_MsgAdd( answer, "Connection", psz_connection ); |
| 54 |
+ httpd_MsgAdd( answer, "Connection", "%s", psz_connection ); |
| 55 |
} |
| 56 |
|
| 57 |
httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.1 src/patchsets/vlc/0.8.6c/350_all_stack_based_overflow_subtitles.patch |
| 62 |
|
| 63 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/350_all_stack_based_overflow_subtitles.patch?rev=1.1&view=markup |
| 64 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/350_all_stack_based_overflow_subtitles.patch?rev=1.1&content-type=text/plain |
| 65 |
|
| 66 |
Index: 350_all_stack_based_overflow_subtitles.patch |
| 67 |
=================================================================== |
| 68 |
Timestamp: 12/24/07 17:42:08 |
| 69 |
Author: courmisch |
| 70 |
Message: [20715] is too large to be backported. Put buffer size limits instead. |
| 71 |
|
| 72 |
Timestamp: 06/30/07 00:41:49 |
| 73 |
Author: fenrir |
| 74 |
Message: |
| 75 |
Fixed potential sscanf buffer overflow in : |
| 76 |
* ParseMicroDvd? |
| 77 |
* ParseSubRip? |
| 78 |
* ParseSubViewer? |
| 79 |
* ParseSSA |
| 80 |
(Reported by Michal Luczaj) |
| 81 |
|
| 82 |
|
| 83 |
Index: vlc-0.8.6d/modules/demux/subtitle.c |
| 84 |
=================================================================== |
| 85 |
--- vlc-0.8.6d.orig/modules/demux/subtitle.c |
| 86 |
+++ vlc-0.8.6d/modules/demux/subtitle.c |
| 87 |
@@ -723,8 +723,8 @@ next: |
| 88 |
i_stop = 0; |
| 89 |
|
| 90 |
memset( buffer_text, '\0', MAX_LINE ); |
| 91 |
- if( sscanf( s, "{%d}{}%[^\r\n]", &i_start, buffer_text ) == 2 || |
| 92 |
- sscanf( s, "{%d}{%d}%[^\r\n]", &i_start, &i_stop, buffer_text ) == 3) |
| 93 |
+ if( sscanf( s, "{%d}{}%8192[^\r\n]", &i_start, buffer_text ) == 2 || |
| 94 |
+ sscanf( s, "{%d}{%d}%8192[^\r\n]", &i_start, &i_stop, buffer_text ) == 3) |
| 95 |
{ |
| 96 |
break; |
| 97 |
} |
| 98 |
@@ -949,8 +949,8 @@ static int ParseSSA( demux_t *p_demux, |
| 99 |
demux_sys_t *p_sys = p_demux->p_sys; |
| 100 |
text_t *txt = &p_sys->txt; |
| 101 |
|
| 102 |
- char buffer_text[ 10 * MAX_LINE]; |
| 103 |
- char buffer_text2[ 10 * MAX_LINE]; |
| 104 |
+ char buffer_text[ 10 * MAX_LINE + 1]; |
| 105 |
+ char buffer_text2[ 10 * MAX_LINE + 1]; |
| 106 |
char *s; |
| 107 |
int64_t i_start; |
| 108 |
int64_t i_stop; |
| 109 |
@@ -981,7 +981,7 @@ static int ParseSSA( demux_t *p_demux, |
| 110 |
* Dialogue: Layer#,0:02:40.65,0:02:41.79,Wolf main,Cher,0000,0000,0000,,Et les enregistrements de ses ondes delta ? |
| 111 |
*/ |
| 112 |
if( sscanf( s, |
| 113 |
- "Dialogue: %[^,],%d:%d:%d.%d,%d:%d:%d.%d,%[^\r\n]", |
| 114 |
+ "Dialogue: %[^,],%d:%d:%d.%d,%d:%d:%d.%d,%81920[^\r\n]", |
| 115 |
buffer_text2, |
| 116 |
&h1, &m1, &s1, &c1, |
| 117 |
&h2, &m2, &s2, &c2, |
| 118 |
@@ -1075,7 +1075,7 @@ static int ParseVplayer( demux_t *p_dem |
| 119 |
i_start = 0; |
| 120 |
|
| 121 |
memset( buffer_text, '\0', MAX_LINE ); |
| 122 |
- if( sscanf( p, "%d:%d:%d%[ :]%[^\r\n]", &h, &m, &s, &c, buffer_text ) == 5 ) |
| 123 |
+ if( sscanf( p, "%d:%d:%d%[ :]%81920[^\r\n]", &h, &m, &s, &c, buffer_text ) == 5 ) |
| 124 |
{ |
| 125 |
i_start = ( (int64_t)h * 3600*1000 + |
| 126 |
(int64_t)m * 60*1000 + |
| 127 |
|
| 128 |
|
| 129 |
|
| 130 |
-- |
| 131 |
gentoo-commits@l.g.o mailing list |
Archives