Rel 3; fix CVE-2014-10401

diff --git a/cve-2014-10401.patch b/cve-2014-10401.patch
new file mode 100644 (file)
index 0000000..2773045
--- /dev/null
+++ b/cve-2014-10401.patch
@@ -0,0 +1,42 @@
+From 19d0fb169eed475e1c053e99036b8668625cfa94 Mon Sep 17 00:00:00 2001
+From: Jens Rehsack <sno@netbsd.org>
+Date: Tue, 6 Oct 2020 10:22:17 +0200
+Subject: [PATCH] lib/DBD/File.pm: fix CVE-2014-10401
+
+Dig into the root cause of RT#99508 - which resulted in CVE-2014-10401 - and
+figure out that DBI->parse_dsn is the wrong helper to parse our attributes in
+DSN, since in DBD::dr::connect only the "dbname" remains from DSN which causes
+parse_dsn to bailout.
+
+Parsing on our own similar to parse_dsn shows the way out.
+
+Signed-off-by: Jens Rehsack <sno@netbsd.org>
+---
+ lib/DBD/File.pm | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/lib/DBD/File.pm b/lib/DBD/File.pm
+index fb14e9a..f55076f 100644
+--- a/lib/DBD/File.pm
++++ b/lib/DBD/File.pm
+@@ -109,7 +109,11 @@ sub connect
+     # We do not (yet) care about conflicting attributes here
+     # my $dbh = DBI->connect ("dbi:CSV:f_dir=test", undef, undef, { f_dir => "text" });
+     # will test here that both test and text should exist
+-    if (my $attr_hash = (DBI->parse_dsn ($dbname))[3]) {
++    #
++    # Parsing on our own similar to parse_dsn to find attributes in 'dbname' parameter.
++    if ($dbname) {
++      my @attrs = split /;/ => $dbname;
++      my $attr_hash = { map { split /\s*=>?\s*|\s*,\s*/, $_} @attrs };
+       if (defined $attr_hash->{f_dir} && ! -d $attr_hash->{f_dir}) {
+           my $msg = "No such directory '$attr_hash->{f_dir}";
+           $drh->set_err (2, $msg);
+@@ -120,7 +124,6 @@ sub connect
+     if ($attr and defined $attr->{f_dir} && ! -d $attr->{f_dir}) {
+       my $msg = "No such directory '$attr->{f_dir}";
+       $drh->set_err (2, $msg);
+-      $attr->{RaiseError} and croak $msg;
+       return;
+       }
+ 

diff --git a/perl-DBI.spec b/perl-DBI.spec
index b195136594f0f076c5c1983777a50c5ff90f852d..3d62b90a1d09c68a180f7af84aa493d9da728a7b 100644 (file)
--- a/perl-DBI.spec
+++ b/perl-DBI.spec
@@ -23,11 +23,12 @@ Summary(sv.UTF-8):  Ett databasåtkomst-API för Perl
 Summary(zh_CN.UTF-8):  Perl 的数据库访问 API。
 Name:          perl-DBI
 Version:       1.643
-Release:       2
+Release:       3
 License:       GPL or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-module/DBI/%{pnam}-%{version}.tar.gz
 # Source0-md5: 352f80b1e23769c116082a90905d7398
+Patch0:                cve-2014-10401.patch
 URL:           https://metacpan.org/release/DBI
 BuildRequires: perl-ExtUtils-MakeMaker >= 6.48
 BuildRequires: perl-devel >= 1:5.8.1
@@ -203,6 +204,8 @@ Apache'a. Można je analizować za pomocą dbiprof.
 
 %prep
 %setup -q -n %{pnam}-%{version}
+%patch0 -p1
+
 mv Changes lib/DBI/Changes.pod
 echo 'man DBI::Changes' > Changes