37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
|
From c6c8e0d097d6ba12471c6112c3fd339ea40329d5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
|
||
|
|
Date: Mon, 13 May 2019 16:58:01 -0300
|
||
|
|
Subject: [PATCH] ask-password: prevent buffer overrow when reading from
|
||
|
|
keyring
|
||
|
|
|
||
|
|
When we read from keyring, a temporary buffer is allocated in order to
|
||
|
|
determine the size needed for the entire data. However, when zeroing that area,
|
||
|
|
we use the data size returned by the read instead of the lesser size allocate
|
||
|
|
for the buffer.
|
||
|
|
|
||
|
|
That will cause memory corruption that causes systemd-cryptsetup to crash
|
||
|
|
either when a single large password is used or when multiple passwords have
|
||
|
|
already been pushed to the keyring.
|
||
|
|
|
||
|
|
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
|
||
|
|
(cherry picked from commit 59c55e73eaee345e1ee67c23eace8895ed499693)
|
||
|
|
|
||
|
|
Resolves: #1752050
|
||
|
|
---
|
||
|
|
src/shared/ask-password-api.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
|
||
|
|
index 682dc754fc..764ebd08e1 100644
|
||
|
|
--- a/src/shared/ask-password-api.c
|
||
|
|
+++ b/src/shared/ask-password-api.c
|
||
|
|
@@ -79,7 +79,7 @@ static int retrieve_key(key_serial_t serial, char ***ret) {
|
||
|
|
if (n < m)
|
||
|
|
break;
|
||
|
|
|
||
|
|
- explicit_bzero(p, n);
|
||
|
|
+ explicit_bzero(p, m);
|
||
|
|
free(p);
|
||
|
|
m *= 2;
|
||
|
|
}
|