[SCM] kwallet packaging branch, master, updated. debian/5.37.0-2-96-g74de6bf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwallet.git;a=commitdiff;h=c1944ef

The following commit has been merged in the master branch:
commit c1944ef249f6613a854195f8673c963f71b79607
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Oct 21 07:55:00 2015 +0200

    Add upstream_initialize-socket-size-with-correct-value.patch
    
    to resolve a rather impactful error where kwalletd5, when started through
    the PAM, would fail to communicate with its environment socket and thus
    end up with a night empty environment rendering the daemon broken.
    https://bugs.kde.org/show_bug.cgi?id=351805
---
 debian/changelog                                   | 12 ++++++
 debian/patches/series                              |  1 +
 ...initialize-socket-size-with-correct-value.patch | 44 ++++++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 20e680f..545c02e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kwallet-kf5 (5.15.0-0ubuntu2) wily; urgency=medium
+
+  * Add upstream_initialize-socket-size-with-correct-value.patch to resolve a
+    rather impactful error where kwalletd5, when started through the PAM,
+    would fail to communicate with its environment socket and thus end up with
+    a night empty environment rendering the daemon broken.
+    The patch has been refreshed on top of 5.15 as git master has additional
+    changes.
+    https://bugs.kde.org/show_bug.cgi?id=351805
+
+ -- Harald Sitter <sitter at kde.org>  Wed, 21 Oct 2015 07:41:12 +0200
+
 kwallet-kf5 (5.15.0-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e0e7971
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_initialize-socket-size-with-correct-value.patch
diff --git a/debian/patches/upstream_initialize-socket-size-with-correct-value.patch b/debian/patches/upstream_initialize-socket-size-with-correct-value.patch
new file mode 100644
index 0000000..8be1e51
--- /dev/null
+++ b/debian/patches/upstream_initialize-socket-size-with-correct-value.patch
@@ -0,0 +1,44 @@
+From f1e6b9d168281196010c44af2eae4587c1d2d088 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter at kde.org>
+Date: Wed, 21 Oct 2015 07:38:48 +0200
+Subject: [PATCH] initialize socket size with correct value
+
+to quote man 2 accept:
+> The addrlen argument is a value-result argument: the caller must
+> initialize it to contain the size (in bytes) of the structure pointed
+> to by addr; on return it will contain the actual size of the peer
+> address.
+
+If addrlen is not correct we may get EINVAL on trying to connect to the
+environment socket which in turn results in a broken environment of the
+daemon when started through pam as it will inherit the DM environment.
+This doesn't have to happen, it does however reproducibly with nvidia-352
+on Kubuntu 15.10. Why or how nvidia plays into this is not entirely clear,
+best bet is that it simply is a coincidence where nvidia would have
+something allocated in the memory beforehand and since the addrlen
+stack variable was not explicitly initialized to anything it would could
+potentially be negative (EINVAL condition) or wrong such that it meets
+an internal error check within accept().
+
+CHANGELOG: Fixed KWallet configuration file warnings on login
+FIXED-IN: 5.16
+BUG: 351805
+REVIEW: 125717
+---
+ src/runtime/kwalletd/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: kwallet-kf5-5.15.0/src/runtime/kwalletd/main.cpp
+===================================================================
+--- kwallet-kf5-5.15.0.orig/src/runtime/kwalletd/main.cpp
++++ kwallet-kf5-5.15.0/src/runtime/kwalletd/main.cpp
+@@ -82,8 +82,8 @@ static int waitForEnvironment()
+     printf("kwalletd: waitingForEnvironment on: %d
", socketfd);
+ 
+     int s2;
+-    socklen_t t;
+     struct sockaddr_un remote;
++    socklen_t t = sizeof(remote);
+     if ((s2 = accept(socketfd, (struct sockaddr *)&remote, &t)) == -1) {
+         fprintf(stdout, "kwalletd: Couldn't accept incoming connection
");
+         return -1;

-- 
kwallet packaging