1*4882a593SmuzhiyunBackport patch to fix CVE-2014-10402.
2*4882a593Smuzhiyun
3*4882a593SmuzhiyunCVE: CVE-2014-10402
4*4882a593SmuzhiyunUpstream-Status: Backport [https://github.com/rehsack/dbi/commit/19d0fb1]
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunRef:
7*4882a593Smuzhiyunhttps://bugs.debian.org/cgi-bin/bugreport.cgi?bug=972180#12
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunSigned-off-by: Kai Kang <kai.kang@windriver.com>
10*4882a593Smuzhiyun
11*4882a593Smuzhiyun
12*4882a593SmuzhiyunFrom 19d0fb169eed475e1c053e99036b8668625cfa94 Mon Sep 17 00:00:00 2001
13*4882a593SmuzhiyunFrom: Jens Rehsack <sno@netbsd.org>
14*4882a593SmuzhiyunDate: Tue, 6 Oct 2020 10:22:17 +0200
15*4882a593SmuzhiyunSubject: [PATCH] lib/DBD/File.pm: fix CVE-2014-10401
16*4882a593Smuzhiyun
17*4882a593SmuzhiyunDig into the root cause of RT#99508 - which resulted in CVE-2014-10401 - and
18*4882a593Smuzhiyunfigure out that DBI->parse_dsn is the wrong helper to parse our attributes in
19*4882a593SmuzhiyunDSN, since in DBD::dr::connect only the "dbname" remains from DSN which causes
20*4882a593Smuzhiyunparse_dsn to bailout.
21*4882a593Smuzhiyun
22*4882a593SmuzhiyunParsing on our own similar to parse_dsn shows the way out.
23*4882a593Smuzhiyun
24*4882a593SmuzhiyunSigned-off-by: Jens Rehsack <sno@netbsd.org>
25*4882a593Smuzhiyun---
26*4882a593Smuzhiyun lib/DBD/File.pm | 7 +++++--
27*4882a593Smuzhiyun 1 file changed, 5 insertions(+), 2 deletions(-)
28*4882a593Smuzhiyun
29*4882a593Smuzhiyundiff --git a/lib/DBD/File.pm b/lib/DBD/File.pm
30*4882a593Smuzhiyunindex fb14e9a..f55076f 100644
31*4882a593Smuzhiyun--- a/lib/DBD/File.pm
32*4882a593Smuzhiyun+++ b/lib/DBD/File.pm
33*4882a593Smuzhiyun@@ -109,7 +109,11 @@ sub connect
34*4882a593Smuzhiyun     # We do not (yet) care about conflicting attributes here
35*4882a593Smuzhiyun     # my $dbh = DBI->connect ("dbi:CSV:f_dir=test", undef, undef, { f_dir => "text" });
36*4882a593Smuzhiyun     # will test here that both test and text should exist
37*4882a593Smuzhiyun-    if (my $attr_hash = (DBI->parse_dsn ($dbname))[3]) {
38*4882a593Smuzhiyun+    #
39*4882a593Smuzhiyun+    # Parsing on our own similar to parse_dsn to find attributes in 'dbname' parameter.
40*4882a593Smuzhiyun+    if ($dbname) {
41*4882a593Smuzhiyun+	my @attrs = split /;/ => $dbname;
42*4882a593Smuzhiyun+	my $attr_hash = { map { split /\s*=>?\s*|\s*,\s*/, $_} @attrs };
43*4882a593Smuzhiyun 	if (defined $attr_hash->{f_dir} && ! -d $attr_hash->{f_dir}) {
44*4882a593Smuzhiyun 	    my $msg = "No such directory '$attr_hash->{f_dir}";
45*4882a593Smuzhiyun 	    $drh->set_err (2, $msg);
46*4882a593Smuzhiyun@@ -120,7 +124,6 @@ sub connect
47*4882a593Smuzhiyun     if ($attr and defined $attr->{f_dir} && ! -d $attr->{f_dir}) {
48*4882a593Smuzhiyun 	my $msg = "No such directory '$attr->{f_dir}";
49*4882a593Smuzhiyun 	$drh->set_err (2, $msg);
50*4882a593Smuzhiyun-	$attr->{RaiseError} and croak $msg;
51*4882a593Smuzhiyun 	return;
52*4882a593Smuzhiyun 	}
53*4882a593Smuzhiyun
54*4882a593Smuzhiyun--
55*4882a593Smuzhiyun2.17.1
56*4882a593Smuzhiyun
57