From 4c6d5d92bd9ab34ab817148356c2c20545e1cca8 Mon Sep 17 00:00:00 2001
From: Sergio Correia <scorreia@redhat.com>
Date: Sat, 4 May 2024 00:38:33 +0100
Subject: [PATCH] udisks2: check for EINTR when reading in recover_key()

Also try to prevent possible overflows.

Signed-off-by: Sergio Correia <scorreia@redhat.com>
---
 src/luks/udisks2/clevis-luks-udisks2.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/luks/udisks2/clevis-luks-udisks2.c b/src/luks/udisks2/clevis-luks-udisks2.c
index be3c53f9..8b48705b 100644
--- a/src/luks/udisks2/clevis-luks-udisks2.c
+++ b/src/luks/udisks2/clevis-luks-udisks2.c
@@ -301,12 +301,12 @@ on_signal(int sig)
     safeclose(&pair[0]);
 }
 
-static ssize_t
-recover_key(const pkt_t *jwe, char *out, size_t max, uid_t uid, gid_t gid)
+static uint32_t
+recover_key(const pkt_t *jwe, char *out, int32_t max, uid_t uid, gid_t gid)
 {
     int push[2] = { -1, -1 };
     int pull[2] = { -1, -1 };
-    ssize_t bytes = 0;
+    int32_t bytes = 0;
     pid_t chld = 0;
 
     if (pipe(push) != 0)
@@ -381,12 +381,18 @@ recover_key(const pkt_t *jwe, char *out, size_t max, uid_t uid, gid_t gid)
     }
 
     bytes = 0;
-    for (ssize_t block = 1; block > 0; bytes += block) {
-        block = read(pull[PIPE_RD], &out[bytes], max - bytes);
-        if (block < 0) {
+    ssize_t block = 0;
+    while (max > 0 && max > bytes) {
+        do {
+            block = read(pull[PIPE_RD], &out[bytes], max - bytes);
+        } while (block < 0 && errno == EINTR);
+        if (block < 0 || block < INT32_MIN || block > INT32_MAX) {
             kill(chld, SIGTERM);
             goto error;
         }
+        if (block == 0)
+            break;
+        bytes += block;
     }
 
     safeclose(&pull[PIPE_RD]);