Hello community,
here is the log from the commit of package kernel-source
checked in at Sun Jun 8 12:06:29 CEST 2008.
--------
--- kernel-source/kernel-debug.changes 2008-06-06 12:26:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/STABLE/kernel-source/kernel-debug.changes 2008-06-07 01:50:03.562361000 +0200
@@ -1,0 +2,6 @@
+Sat Jun 7 01:51:16 CEST 2008 - gregkh@suse.de
+
+- Update to 2.6.25.5.
+ - fixes CVE-2008-1673
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-rt.changes: same change
kernel-rt_debug.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.B14118/_old 2008-06-08 12:02:17.000000000 +0200
+++ /var/tmp/diff_new_pack.B14118/_new 2008-06-08 12:02:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-debug (Version 2.6.25.4)
+# spec file for package kernel-debug (Version 2.6.25.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -42,8 +42,8 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
-Version: 2.6.25.4
-Release: 13
+Version: 2.6.25.5
+Release: 1
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -196,12 +196,12 @@
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-debug-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-debug-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -278,7 +278,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -214,12 +214,12 @@
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-default-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-default-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -296,7 +296,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%install
rm -rf %buildroot
@@ -40,6 +40,9 @@
%defattr(-, root, root)
/etc/dummy
%changelog
+* Sat Jun 07 2008 gregkh@suse.de
+- Update to 2.6.25.5.
+ - fixes CVE-2008-1673
* Fri Jun 06 2008 tiwai@suse.de
- add missing patches.rt/ftrace-add-nr_syscalls.patch for fixing
i386-rt_debug
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.B14118/_old 2008-06-08 12:02:17.000000000 +0200
+++ /var/tmp/diff_new_pack.B14118/_new 2008-06-08 12:02:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-kdump (Version 2.6.25.4)
+# spec file for package kernel-kdump (Version 2.6.25.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -42,8 +42,8 @@
Name: kernel-kdump
Summary: kernel for kdump
-Version: 2.6.25.4
-Release: 13
+Version: 2.6.25.5
+Release: 1
License: GPL v2 or later
Group: System/Kernel
Url: http://lse.sourceforge.net/kdump/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
%ifarch ppc
@@ -195,12 +195,12 @@
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-kdump-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-kdump-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -277,7 +277,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
Provides: k_smp4G kernel-bigsmp
@@ -191,12 +191,12 @@
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-pae-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-pae-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -273,7 +273,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
%ifarch ppc
@@ -208,12 +208,12 @@
Tom Gall
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-ppc64-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -290,7 +290,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
%ifarch ppc
@@ -194,12 +194,12 @@
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-ps3-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-ps3-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -276,7 +276,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -193,12 +193,12 @@
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-rt_debug-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-rt_debug-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -275,7 +275,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -198,12 +198,12 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-rt-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-rt-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -280,7 +280,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
Provides: kernel-32bit k_deflt
@@ -189,12 +189,12 @@
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-s390-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-s390-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -271,7 +271,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs < %_builddir/kernel-source-2.6.25.4/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.25.4/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.25.4/$patch; then
+ > %_builddir/kernel-source-2.6.25.5/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.25.5/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.25.5/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
@@ -145,7 +145,7 @@
cat %_sourcedir/localversion > localversion
fi
%_sourcedir/install-configs %_sourcedir %_builddir/%buildsubdir $RELEASE
-KERNELRELEASE=2.6.25.4-$RELEASE
+KERNELRELEASE=2.6.25.5-$RELEASE
cat > %_builddir/%{name}-%{version}/.rpm-defs < %_builddir/kernel-source-2.6.25.4/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.25.4/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.25.5/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.25.5/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -288,6 +288,9 @@
%files -f kernel-source.files
%changelog
+* Sat Jun 07 2008 gregkh@suse.de
+- Update to 2.6.25.5.
+ - fixes CVE-2008-1673
* Fri Jun 06 2008 tiwai@suse.de
- add missing patches.rt/ftrace-add-nr_syscalls.patch for fixing
i386-rt_debug
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.B14118/_old 2008-06-08 12:02:19.000000000 +0200
+++ /var/tmp/diff_new_pack.B14118/_new 2008-06-08 12:02:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.25.4)
+# spec file for package kernel-syms (Version 2.6.25.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,8 +21,8 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
-Version: 2.6.25.4
-Release: 13
+Version: 2.6.25.5
+Release: 1
License: GPL v2 or later
Group: Development/Sources
AutoReqProv: off
@@ -61,7 +61,7 @@
#!BuildIgnore: irqbalance xen
#!BuildIgnore: perl-Bootloader mkinitrd
Requires: linux
-Requires: kernel-source = 2.6.25.4-%source_rel
+Requires: kernel-source = 2.6.25.5-%source_rel
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -92,7 +92,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
echo "Architecture symbol(s):" %symbols
@@ -144,6 +144,9 @@
/boot/symsets-*-*.tar.gz
/lib/modules/*/build
%changelog
+* Sat Jun 07 2008 gregkh@suse.de
+- Update to 2.6.25.5.
+ - fixes CVE-2008-1673
* Fri Jun 06 2008 tiwai@suse.de
- add missing patches.rt/ftrace-add-nr_syscalls.patch for fixing
i386-rt_debug
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.B14118/_old 2008-06-08 12:02:19.000000000 +0200
+++ /var/tmp/diff_new_pack.B14118/_new 2008-06-08 12:02:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-vanilla (Version 2.6.25.4)
+# spec file for package kernel-vanilla (Version 2.6.25.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -42,8 +42,8 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
-Version: 2.6.25.4
-Release: 13
+Version: 2.6.25.5
+Release: 1
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -206,12 +206,12 @@
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-vanilla-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-vanilla-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -288,7 +288,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/
@@ -83,8 +83,8 @@
%if %build_xen
Requires: xen >= xen-3.0.4_13138
%ifarch %ix86
-Provides: kernel-xenpae = 2.6.25.4
-Obsoletes: kernel-xenpae <= 2.6.25.4
+Provides: kernel-xenpae = 2.6.25.5
+Obsoletes: kernel-xenpae <= 2.6.25.5
%endif
#!BuildIgnore: xen
%endif
@@ -110,7 +110,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.25.4-%source_rel
+Provides: kernel = 2.6.25.5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -195,12 +195,12 @@
-Source Timestamp: 2008-06-06 12:24:12 +0200
+Source Timestamp: 2008-06-07 01:55:22 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then
- echo "The kernel-xen-2.6.25.4.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.25.4.src.rpm."
+ echo "The kernel-xen-2.6.25.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.25.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -277,7 +277,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <
+Subject: Linux 2.6.25.5
+
+Signed-off-by: Greg Kroah-Hartman
+
+diff --git a/Makefile b/Makefile
+index d921f0b..c5208db 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 25
+-EXTRAVERSION = .4
++EXTRAVERSION = .5
+ NAME = Funky Weasel is Jiggy wit it
+
+ # *DOCUMENTATION*
+diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
+index bcda2c6..5dbba89 100644
+--- a/fs/cifs/asn1.c
++++ b/fs/cifs/asn1.c
+@@ -186,6 +186,11 @@ asn1_length_decode(struct asn1_ctx *ctx, unsigned int *def, unsigned int *len)
+ }
+ }
+ }
++
++ /* don't trust len bigger than ctx buffer */
++ if (*len > ctx->end - ctx->pointer)
++ return 0;
++
+ return 1;
+ }
+
+@@ -203,6 +208,10 @@ asn1_header_decode(struct asn1_ctx *ctx,
+ if (!asn1_length_decode(ctx, &def, &len))
+ return 0;
+
++ /* primitive shall be definite, indefinite shall be constructed */
++ if (*con == ASN1_PRI && !def)
++ return 0;
++
+ if (def)
+ *eoc = ctx->pointer + len;
+ else
+@@ -389,6 +398,11 @@ asn1_oid_decode(struct asn1_ctx *ctx,
+ unsigned long *optr;
+
+ size = eoc - ctx->pointer + 1;
++
++ /* first subid actually encodes first two subids */
++ if (size < 2 || size > ULONG_MAX/sizeof(unsigned long))
++ return 0;
++
+ *oid = kmalloc(size * sizeof(unsigned long), GFP_ATOMIC);
+ if (*oid == NULL)
+ return 0;
+diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
+index 540ce6a..5f35f0b 100644
+--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
++++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
+@@ -231,6 +231,11 @@ static unsigned char asn1_length_decode(struct asn1_ctx *ctx,
+ }
+ }
+ }
++
++ /* don't trust len bigger than ctx buffer */
++ if (*len > ctx->end - ctx->pointer)
++ return 0;
++
+ return 1;
+ }
+
+@@ -249,6 +254,10 @@ static unsigned char asn1_header_decode(struct asn1_ctx *ctx,
+ if (!asn1_length_decode(ctx, &def, &len))
+ return 0;
+
++ /* primitive shall be definite, indefinite shall be constructed */
++ if (*con == ASN1_PRI && !def)
++ return 0;
++
+ if (def)
+ *eoc = ctx->pointer + len;
+ else
+@@ -433,6 +442,11 @@ static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
+ unsigned long *optr;
+
+ size = eoc - ctx->pointer + 1;
++
++ /* first subid actually encodes first two subids */
++ if (size < 2 || size > ULONG_MAX/sizeof(unsigned long))
++ return 0;
++
+ *oid = kmalloc(size * sizeof(unsigned long), GFP_ATOMIC);
+ if (*oid == NULL) {
+ if (net_ratelimit())
++++++ patches.rpmify.tar.bz2 ++++++
++++++ patches.rt.tar.bz2 ++++++
++++++ patches.suse.tar.bz2 ++++++
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
++++++ series.conf ++++++
--- kernel-source/series.conf 2008-06-06 12:26:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/STABLE/kernel-source/series.conf 2008-06-07 01:49:03.043940000 +0200
@@ -31,6 +31,7 @@
patches.kernel.org/patch-2.6.25.1-2
patches.kernel.org/patch-2.6.25.2-3
patches.kernel.org/patch-2.6.25.3-4
+ patches.kernel.org/patch-2.6.25.4-5
########################################################
# Build fixes that apply to the vanilla kernel too.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org