OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Sep-2005 16:28:36
Branch: OPENPKG_2_3_SOLID Handle: 2005090515283400
Modified files: (Branch: OPENPKG_2_3_SOLID)
openpkg-src/fsl fsl.patch fsl.spec
Log:
apply Security Fix (CAN-2005-2491, partially)
Summary:
Revision Changes Path
1.5.6.2 +57 -0 openpkg-src/fsl/fsl.patch
1.76.2.4 +1 -1 openpkg-src/fsl/fsl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/fsl/fsl.patch
============================================================================
$ cvs diff -u -r1.5.6.1 -r1.5.6.2 fsl.patch
--- openpkg-src/fsl/fsl.patch 8 Mar 2005 09:27:24 -0000 1.5.6.1
+++ openpkg-src/fsl/fsl.patch 5 Sep 2005 14:28:34 -0000 1.5.6.2
@@ -23,3 +23,60 @@
if (he->h_addrtype == AF_INET) {
sa4.sin_family = AF_INET;
sa4.sin_port = htons(nPort);
+
+-----------------------------------------------------------------------------
+
+Security Fix (CAN-2005-2491, partially only)
+
+Index: lib_pcre/pcre.c
+--- lib_pcre/pcre.c.orig 2004-04-22 10:52:11 +0200
++++ lib_pcre/pcre.c 2005-09-05 15:38:37 +0200
+@@ -716,12 +716,23 @@
+
+ while ((cd->ctypes[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
+
++if (min < 0 || min > 65535)
++ {
++ *errorptr = ERR5;
++ return p;
++ }
++
+ if (*p == '}') max = min; else
+ {
+ if (*(++p) != '}')
+ {
+ max = 0;
+ while((cd->ctypes[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
++ if (max < 0 || max > 65535)
++ {
++ *errorptr = ERR5;
++ return p;
++ }
+ if (max < min)
+ {
+ *errorptr = ERR4;
+Index: lib_l2/l2_ut_pcre.c
+--- lib_l2/l2_ut_pcre.c.orig 2003-01-28 10:10:39 +0100
++++ lib_l2/l2_ut_pcre.c 2005-09-05 16:22:43 +0200
+@@ -674,6 +674,10 @@
+
+ while ((cd->ctypes[*p] & ctype_digit) != 0)
+ min = min * 10 + *p++ - '0';
++ if (min < 0 || min > 65535) {
++ *errorptr = ERR5;
++ return p;
++ }
+
+ if (*p == '}')
+ max = min;
+@@ -682,6 +686,10 @@
+ max = 0;
+ while ((cd->ctypes[*p] & ctype_digit) != 0)
+ max = max * 10 + *p++ - '0';
++ if (max < 0 || max > 65535) {
++ *errorptr = ERR5;
++ return p;
++ }
+ if (max < min) {
+ *errorptr = ERR4;
+ return p;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fsl/fsl.spec
============================================================================
$ cvs diff -u -r1.76.2.3 -r1.76.2.4 fsl.spec
--- openpkg-src/fsl/fsl.spec 23 Jun 2005 13:58:27 -0000 1.76.2.3
+++ openpkg-src/fsl/fsl.spec 5 Sep 2005 14:28:34 -0000 1.76.2.4
@@ -34,7 +34,7 @@
Group: System
License: MIT-style
Version: 1.6.0
-Release: 2.3.2
+Release: 2.3.3
# package options
%option with_fsl_debuglogcode no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]