svn commit: r363628 - in branches/2014Q3/x11/kdelibs4: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Thu Jul 31 16:10:12 2014
New Revision: 363628
URL: http://svnweb.freebsd.org/changeset/ports/363628
QAT: https://qat.redports.org/buildarchive/r363628/

Log:
  MFH: r363621
  
  Add upstream patch for CVE-2014-5033.
  
  Security:	2f90556f-18c6-11e4-9cc4-5453ed2e2b49
  
  Approved by:	portmgr (erwin)

Added:
  branches/2014Q3/x11/kdelibs4/files/patch-CVE-2014-5033
     - copied unchanged from r363621, head/x11/kdelibs4/files/patch-CVE-2014-5033
Modified:
  branches/2014Q3/x11/kdelibs4/Makefile
Directory Properties:
  branches/2014Q3/   (props changed)

Modified: branches/2014Q3/x11/kdelibs4/Makefile
==============================================================================
--- branches/2014Q3/x11/kdelibs4/Makefile	Thu Jul 31 16:08:50 2014	(r363627)
+++ branches/2014Q3/x11/kdelibs4/Makefile	Thu Jul 31 16:10:12 2014	(r363628)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

Copied: branches/2014Q3/x11/kdelibs4/files/patch-CVE-2014-5033 (from r363621, head/x11/kdelibs4/files/patch-CVE-2014-5033)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q3/x11/kdelibs4/files/patch-CVE-2014-5033	Thu Jul 31 16:10:12 2014	(r363628, copy of r363621, head/x11/kdelibs4/files/patch-CVE-2014-5033)
@@ -0,0 +1,48 @@
+commit e4e7b53b71e2659adaf52691d4accc3594203b23
+Author: Martin T. H. Sandsmark <martin.sandsmark at kde.org>
+Date:   Mon Jul 21 22:52:40 2014 +0200
+
+    Use dbus system bus name instead of PID for authentication.
+    
+    Using the PID for authentication is prone to a PID reuse
+    race condition, and a security issue.
+    
+    REVIEW: 119323
+
+diff --git a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
+index cd7f6f3..732d2cb 100644
+--- kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
++++ kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
+@@ -144,7 +144,7 @@ void Polkit1Backend::setupAction(const QString &action)
+ 
+ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
+ {
+-    PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
++    PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
+     PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject,
+                                                                                               PolkitQt1::Authority::None);
+     switch (r) {
+@@ -160,21 +160,12 @@ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
+ 
+ QByteArray Polkit1Backend::callerID() const
+ {
+-    QByteArray a;
+-    QDataStream s(&a, QIODevice::WriteOnly);
+-    s << QCoreApplication::applicationPid();
+-
+-    return a;
++    return QDBusConnection::systemBus().baseService().toUtf8();
+ }
+ 
+ bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
+ {
+-    QDataStream s(&callerID, QIODevice::ReadOnly);
+-    qint64 pid;
+-
+-    s >> pid;
+-
+-    PolkitQt1::UnixProcessSubject subject(pid);
++    PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
+     PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
+ 
+     PolkitResultEventLoop e;