summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-06-30 14:19:36 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-06-30 14:19:36 +0100
commit0fbaad46426b60fd9808a64d79fa0165266e9dff (patch)
treefcfc59401e5b041fae39e19abc2ce9d5d05927e6
parent8c7176019fbc2e8fee41d93ce82ac2603fe57d67 (diff)
Prepare 1.6.22 in advancedbus-1.6.22
-rw-r--r--NEWS17
-rw-r--r--configure.ac4
2 files changed, 17 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 88d44796..5847985a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,20 @@
-D-Bus 1.6.22 (UNRELEASED)
+D-Bus 1.6.22 (2014-06-02)
==
-...
+Security fixes backported from 1.8.6:
+
+• On Linux ≥ 2.6.37-rc4, if sendmsg() fails with ETOOMANYREFS, silently drop
+ the message. This prevents an attack in which a malicious client can
+ make dbus-daemon disconnect a system service, which is a local
+ denial of service.
+ (fd.o #80163, CVE-2014-3532; Alban Crequy)
+
+• Track remaining Unix file descriptors correctly when more than one
+ message in quick succession contains fds. This prevents another attack
+ in which a malicious client can make dbus-daemon disconnect a system
+ service.
+ (fd.o #79694, fd.o #80469, CVE-2014-3533; Alejandro Martínez Suárez,
+ Simon McVittie, Alban Crequy)
D-Bus 1.6.20 (2014-06-10)
==
diff --git a/configure.ac b/configure.ac
index c1fb3911..97b2980e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.63])
m4_define([dbus_major_version], [1])
m4_define([dbus_minor_version], [6])
-m4_define([dbus_micro_version], [21])
+m4_define([dbus_micro_version], [22])
m4_define([dbus_version],
[dbus_major_version.dbus_minor_version.dbus_micro_version])
AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus])
@@ -37,7 +37,7 @@ LT_CURRENT=10
## increment any time the source changes; set to
## 0 if you increment CURRENT
-LT_REVISION=7
+LT_REVISION=8
## increment if any interfaces have been added; set to 0
## if any interfaces have been changed or removed. removal has