From: Akos Vandra <axos88@gmail.com>
Date: Sun, 25 Sep 2016 14:25:41 +0000 (+0200)
Subject: Ability to run in tainted mode for spamassasin plugin.
X-Git-Tag: collectd-5.7.0~65^2~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=f1b604fb0392abaaadbddc05b25631e04356996e;p=collectd.git

Ability to run in tainted mode for spamassasin plugin.
---

diff --git a/contrib/SpamAssassin/Collectd.pm b/contrib/SpamAssassin/Collectd.pm
index 1edcfc61..58d1e686 100644
--- a/contrib/SpamAssassin/Collectd.pm
+++ b/contrib/SpamAssassin/Collectd.pm
@@ -152,8 +152,8 @@ sub check_end {
 		#try at least $self->{main}->{conf}->{collectd_retries} to get a
 		#connection
 		for (my $i = 0; $i < $self->{main}->{conf}->{collectd_retries} ; ++$i) {
-			last if $sock = new IO::Socket::UNIX
-				($self->{main}->{conf}->{collectd_socket});
+		        my ($socket_path) = $self->{main}->{conf}->{collectd_socket} =~ /(.*)/ # Untaint path, which can contain any characters.
+			last if $sock = new IO::Socket::UNIX $socket_path;
 			#sleep a random value between 0 and 50 microsecs to try for a new
 			#thread
 			usleep(int(rand(50)));