Merge lp:~teemperor/pantheon-greeter/fix-1130246 into lp:~elementary-pantheon/pantheon-greeter/trunk

[Raphael Isemann]

Call mlockall to prevent swapping of security-related data to fix bug #1130246.

The posix-fixes.vapi is needed because the mlockall isn't included in the system-vapi.
Kudos to the unity-greeter devs at canonical for the good tipps.

[Cody Garver (codygarver)]

Merge issue:

+N vapi/posix-fixes.vapi
 M CMakeLists.txt
 M src/PantheonGreeter.vala
Text conflict in CMakeLists.txt
1 conflicts encountered.

review: Needs Fixing

[Cody Garver (codygarver)]

WIP, waiting on shnatsel collaboration with teemperor.

[Sergey "Shnatsel" Davidoff (shnatsel)]

I don't think you need a new VAPI for this, Rico showed me a much simpler way to do that. For example, here's how I added fchmod which was missing from POSIX VAPI: http://bazaar.launchpad.net/~shnatsel/elementaryos/bluetooth-tryexecd-vala/view/head:/bluetooth-tryexecd.vala#L31

Btw, make sure you upstream your VAPI changes. Talking to Rico about it might be a good starting point.

review: Needs Fixing

[Sergey "Shnatsel" Davidoff (shnatsel)]

Other than that, looks good to me.

[Sergey "Shnatsel" Davidoff (shnatsel)]

<ricotz> shnatsel, teemperor, better use a vapi if you need that much bindings

So, disregard my complaints. Still,

<ricotz> teemperor, better put it in an more private namespace (not Posix) to avoid clashes with future vala versions if you like to get the upstreamed

review: Abstain

[Sergey "Shnatsel" Davidoff (shnatsel)]

review: Abstain

[Tom Beckmann (tombeckmann)]

Never heard of that function, but I will trust the docs here, the code looks fine.

review: Approve

[Cody Garver (codygarver)]

review: Abstain

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-20 08:58:19 +0000
+++ CMakeLists.txt	2013-07-04 09:27:30 +0000
@@ -49,6 +49,7 @@
     clutter-gtk-1.0
     indicator-0.4
     gl
+    posix-fixes
 OPTIONS
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
 )

=== modified file 'src/PantheonGreeter.vala'
--- src/PantheonGreeter.vala	2013-06-16 19:55:36 +0000
+++ src/PantheonGreeter.vala	2013-07-04 09:27:30 +0000
@@ -287,6 +287,9 @@
 }
 
 public static int main (string [] args) {
+    /* Protect memory from being paged to disk, as we deal with passwords */
+    PosixMLock.mlockall (PosixMLock.MCL_CURRENT | PosixMLock.MCL_FUTURE);
+
     var init = GtkClutter.init (ref args);
     if (init != Clutter.InitError.SUCCESS)
         error ("Clutter could not be intiailized");

=== added file 'vapi/posix-fixes.vapi'
--- vapi/posix-fixes.vapi	1970-01-01 00:00:00 +0000
+++ vapi/posix-fixes.vapi	2013-07-04 09:27:30 +0000
@@ -0,0 +1,12 @@
+[CCode (cprefix = "", lower_case_cprefix = "")]
+namespace PosixMLock
+{
+    [CCode (cheader_filename = "sys/mman.h")]
+    public const int MCL_CURRENT;
+    [CCode (cheader_filename = "sys/mman.h")]
+    public const int MCL_FUTURE;
+    [CCode (cheader_filename = "sys/mman.h")]
+    public int mlockall (int flags);
+    [CCode (cheader_filename = "sys/mman.h")]
+    public int munlockall ();
+}