eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 19:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use proper write_buffer in LUKS1 reencryption code.

Browse Source 
The raw write() syscal may write less bytes than requested. We
have write_buffer in utils_io.c that handles it properly.
This commit is contained in:
Ondrej Kozina
2024-05-06 11:18:46 +02:00
committed by Milan Broz
parent 94ef8a7610
commit 738b9ee645
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/utils_reencrypt_luks1.c
View File

@@ -733,18 +733,14 @@ static int copy_data_forward(struct reenc_ctx *rc, int fd_old, int fd_new,
goto out; goto out;
} }
/* s2 = write_buffer(fd_new, buf, s1);
* FIXME: this may fail with shorter write.
* Replace ir with write_buffer from lib/utils_io.c
*/
s2 = write(fd_new, buf, s1);
if (s2 < 0 || s2 != s1) { if (s2 < 0 || s2 != s1) {
log_dbg("Write error, expecting %zu, got %zd.", log_dbg("Write error, expecting %zd, got %zd.",
block_size, s2); s1, s2);
goto out; goto out;
} }
rc->device_offset += s1; rc->device_offset += s2;
if (ARG_SET(OPT_WRITE_LOG_ID) && write_log(rc) < 0) if (ARG_SET(OPT_WRITE_LOG_ID) && write_log(rc) < 0)
goto out; goto out;
@@ -820,18 +816,14 @@ static int copy_data_backward(struct reenc_ctx *rc, int fd_old, int fd_new,
goto out; goto out;
} }
/* s2 = write_buffer(fd_new, buf, s1);
* FIXME: this may fail with shorter write. if (s2 < 0 || s2 != s1) {
* Replace ir with write_buffer from lib/utils_io.c log_dbg("Write error, expecting %zd, got %zd.",
*/ s1, s2);
s2 = write(fd_new, buf, working_block);
if (s2 < 0) {
log_dbg("Write error, expecting %zu, got %zd.",
block_size, s2);
goto out; goto out;
} }
rc->device_offset -= s1; rc->device_offset -= s2;
if (ARG_SET(OPT_WRITE_LOG_ID) && write_log(rc) < 0) if (ARG_SET(OPT_WRITE_LOG_ID) && write_log(rc) < 0)
goto out; goto out;