commit 6b14b9a82d9cf796ce290dbc29078f5471cb4147
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Fri Jan 11 13:42:11 2013 +0100
Fix CVE-2012-6329
...5.17.6-Fix-misparsing-of-maketext-strings.patch | 81 ++++++++++++++++++++
perl.spec | 10 ++-
2 files changed, 90 insertions(+), 1 deletions(-)
---
diff --git a/perl-5.17.6-Fix-misparsing-of-maketext-strings.patch b/perl-5.17.6-Fix-misparsing-of-maketext-strings.patch
new file mode 100644
index 0000000..9a8629f
--- /dev/null
+++ b/perl-5.17.6-Fix-misparsing-of-maketext-strings.patch
@@ -0,0 +1,81 @@
+From 1735f6f53ca19f99c6e9e39496c486af323ba6a8 Mon Sep 17 00:00:00 2001
+From: Brian Carlson <brian.carlson@xxxxxxxxxx>
+Date: Wed, 28 Nov 2012 08:54:33 -0500
+Subject: [PATCH] Fix misparsing of maketext strings.
+
+Case 61251: This commit fixes a misparse of maketext strings that could
+lead to arbitrary code execution. Basically, maketext was compiling
+bracket notation into functions, but neglected to escape backslashes
+inside the content or die on fully-qualified method names when
+generating the code. This change escapes all such backslashes and dies
+when a method name with a colon or apostrophe is specified.
+---
+ AUTHORS | 1 +
+ dist/Locale-Maketext/lib/Locale/Maketext.pm | 24 ++++++++----------------
+ 2 files changed, 9 insertions(+), 16 deletions(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index 70734b0..009dea0 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -154,6 +154,7 @@ Breno G. de Oliveira <garu@xxxxxxxx>
+ Brent Dax <brentdax@xxxxxxxx>
+ Brooks D Boyd
+ Brian Callaghan <callagh@xxxxxxxxxx>
++Brian Carlson <brian.carlson@xxxxxxxxxx>
+ Brian Clarke <clarke@xxxxxxxxxxxxxxx>
+ brian d foy <brian.d.foy@xxxxxxxxx>
+ Brian Fraser <fraserbn@xxxxxxxxx>
+diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm
+index 4822027..63e5fba 100644
+--- a/dist/Locale-Maketext/lib/Locale/Maketext.pm
++++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm
+@@ -625,21 +625,9 @@ sub _compile {
+ # 0-length method name means to just interpolate:
+ push @code, ' (';
+ }
+- elsif($m =~ /^\w+(?:\:\:\w+)*$/s
+- and $m !~ m/(?:^|\:)\d/s
+- # exclude starting a (sub)package or symbol with a digit
++ elsif($m =~ /^\w+$/s
++ # exclude anything fancy, especially fully-qualified module names
+ ) {
+- # Yes, it even supports the demented (and undocumented?)
+- # $obj->Foo::bar(...) syntax.
+- $target->_die_pointing(
+- $string_to_compile, q{Can't use "SUPER::" in a bracket-group method},
+- 2 + length($c[-1])
+- )
+- if $m =~ m/^SUPER::/s;
+- # Because for SUPER:: to work, we'd have to compile this into
+- # the right package, and that seems just not worth the bother,
+- # unless someone convinces me otherwise.
+-
+ push @code, ' $_[0]->' . $m . '(';
+ }
+ else {
+@@ -693,7 +681,9 @@ sub _compile {
+ elsif(substr($1,0,1) ne '~') {
+ # it's stuff not containing "~" or "[" or "]"
+ # i.e., a literal blob
+- $c[-1] .= $1;
++ my $text = $1;
++ $text =~ s/\\/\\\\/g;
++ $c[-1] .= $text;
+
+ }
+ elsif($1 eq '~~') { # "~~"
+@@ -731,7 +721,9 @@ sub _compile {
+ else {
+ # It's a "~X" where X is not a special character.
+ # Consider it a literal ~ and X.
+- $c[-1] .= $1;
++ my $text = $1;
++ $text =~ s/\\/\\\\/g;
++ $c[-1] .= $text;
+ }
+ }
+ }
+--
+1.7.11.7
+
diff --git a/perl.spec b/perl.spec
index f20973a..42e79e9 100644
--- a/perl.spec
+++ b/perl.spec
@@ -29,7 +29,7 @@
Name: perl
Version: %{perl_version}
# release number must be even higher, because dual-lived modules will be broken otherwise
-Release: 236%{?dist}
+Release: 237%{?dist}
Epoch: %{perl_epoch}
Summary: Practical Extraction and Report Language
Group: Development/Languages
@@ -109,6 +109,9 @@ Patch18: perl-5.16.1-perl-114984-Glob.xs-Extend-stack-when-returning.patc
# Do not crash when vivifying $|, rhbz#865296, RT#115206
Patch19: perl-5.16.1-perl-115206-Don-t-crash-when-vivifying.patch
+# Fix CVE-2012-6329, rhbz#884354
+Patch20: perl-5.17.6-Fix-misparsing-of-maketext-strings.patch
+
# Update some of the bundled modules
# see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
@@ -1336,6 +1339,7 @@ tarball from perl.org.
%patch17 -p1
%patch18 -p1
%patch19 -p1
+%patch20 -p1
#copy the example script
cp -a %{SOURCE5} .
@@ -1546,6 +1550,7 @@ pushd %{build_archlib}/CORE/
'Fedora Patch17: Allow operator after numeric keyword argument (RT#105924)' \
'Fedora Patch18: Extend stack in File::Glob::glob, (RT#114984)' \
'Fedora Patch19: Do not crash when vivifying $|' \
+ 'Fedora Patch20: Fix misparsing of maketext strings (CVE-2012-6329)' \
%{nil}
rm patchlevel.bak
@@ -2618,6 +2623,9 @@ sed \
# Old changelog entries are preserved in CVS.
%changelog
+* Fri Jan 11 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 4:5.16.2-237
+- Fix CVE-2012-6329 (misparsing of maketext strings) (bug #884354)
+
* Thu Jan 10 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 4:5.16.2-236
- Do not package App::Cpan(3pm) to perl-Test-Harness (bug #893768)
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
