From 4506d1859a863087598c8d122740bae25b65b099 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 8 Feb 2021 10:04:48 +0000
Subject: [PATCH 4/5] gtlspassword: Fix inverted assertion

The intention here was to assert that the length of the password fits
in a gssize. Passwords more than half the size of virtual memory are
probably excessive.

Fixes: a8b204ff "gtlspassword: Forbid very long TLS passwords"
Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 61bb52ec42de1082bfb06ce1c737fc295bfe60b8)
---
 gio/gtlspassword.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c
index dbcec41a8..bd86a6dfe 100644
--- a/gio/gtlspassword.c
+++ b/gio/gtlspassword.c
@@ -291,7 +291,7 @@ g_tls_password_set_value (GTlsPassword  *password,
     {
       /* FIXME: g_tls_password_set_value_full() doesn’t support unsigned gsize */
       gsize length_unsigned = strlen ((gchar *) value);
-      g_return_if_fail (length_unsigned > G_MAXSSIZE);
+      g_return_if_fail (length_unsigned <= G_MAXSSIZE);
       length = (gssize) length_unsigned;
     }
 
-- 
2.30.1

>refs</a><a class='active' href='/guix/log/gnu/system/mapped-devices.scm'>log</a><a href='/guix/tree/gnu/system/mapped-devices.scm?id=e69259352a5a989b5cb5a572ad7e7af24c957def'>tree</a><a href='/guix/commit/gnu/system/mapped-devices.scm?id=e69259352a5a989b5cb5a572ad7e7af24c957def'>commit</a><a href='/guix/diff/gnu/system/mapped-devices.scm?id=e69259352a5a989b5cb5a572ad7e7af24c957def'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/system/mapped-devices.scm'>
<input type='hidden' name='id' value='e69259352a5a989b5cb5a572ad7e7af24c957def'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=e69259352a5a989b5cb5a572ad7e7af24c957def'>root</a>/<a href='/guix/log/gnu?id=e69259352a5a989b5cb5a572ad7e7af24c957def'>gnu</a>/<a href='/guix/log/gnu/system?id=e69259352a5a989b5cb5a572ad7e7af24c957def'>system</a>/<a href='/guix/log/gnu/system/mapped-devices.scm?id=e69259352a5a989b5cb5a572ad7e7af24c957def'>mapped-devices.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/system/mapped-devices.scm?id=e69259352a5a989b5cb5a572ad7e7af24c957def&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-04-08 18:14:35 +0200'>2022-04-08</span></td><td><a href='/guix/commit/gnu/system/mapped-devices.scm?id=931f13840bad7bd3cb98b7806f09ca2b3cf7cd10'>mapped-devices: Ensure 'cryptsetup open' gets a tty.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/54770&gt;.
Regression introduced in 400c9ed3d779308e56038305d40cd93acb496180.

Previously, for an encrypted /home (say), "cryptsetup open" would be
invoked by shepherd, with /dev/null as its standard input.  It would
thus run in non-interactive mode and, instead of asking for a
passphrase, fail with:

  Nothing to read on input.

This change ensures it runs in interactive mode.

* gnu/build/file-systems.scm (system*/console, system*/tty): New
procedures.
* gnu/system/mapped-devices.scm (open-luks-device): Use 'system*/tty'
instead of 'system*'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-01 17:51:37 +0100'>2021-12-01</span></td><td><a href='/guix/commit/gnu/system/mapped-devices.scm?id=adce91a3ec0cb2912daa6eefe9324c15ff3126f7'>gnu: system: Add LUKS2 support for the root file system.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/bootloader/grub.scm (grub-configuration-file): Add 'insmod
luks2'.
* gnu/system/mapped-devices.scm (open-luks-device): Create
'/run/cryptsetup/' directory.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2021-01-13 22:24:18 +0100'>2021-01-13</span></td><td><a href='/guix/commit/gnu/system/mapped-devices.scm?id=0d22fc8d36e4efba9748c94cab7cedbbe2bbb5bf'>services: shepherd: 'shepherd-service-type' requires documentation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/shepherd.scm (shepherd-service-type): Require a
'description' form.
* gnu/services/base.scm (root-file-system-service-type)
(rngd-service-type, host-name-service-type):
(virtual-terminal-service-type, console-keymap-service-type)
(syslog-service-type, swap-service-type)
(kmscon-service-type): Add description.
* gnu/services/networking.scm (dhcp-client-service-type): Likewise.
* gnu/system/install.scm (cow-store-service-type): Likewise.
* gnu/system/linux-container.scm (dummy-networking-service-type):
Likewise.
* gnu/system/mapped-devices.scm (device-mapping-service-type):
Likewise.
* tests/guix-system.sh: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>