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

Use read/write buffer functions where appropriate.

Browse Source
This commit is contained in:
Ondrej Kozina
2015-11-30 16:44:17 +01:00
committed by Milan Broz
parent 327ebccdb1
commit 2d298071e4
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/luks1/keymanage.c
View File

@@ -201,7 +201,7 @@ int LUKS_hdr_backup(const char *backup_file, struct crypt_device *ctx)
r = -EINVAL; r = -EINVAL;
goto out; goto out;
} }
if (write(devfd, buffer, buffer_size) < buffer_size) { if (write_buffer(devfd, buffer, buffer_size) < buffer_size) {
log_err(ctx, _("Cannot write header backup file %s.\n"), backup_file); log_err(ctx, _("Cannot write header backup file %s.\n"), backup_file);
r = -EIO; r = -EIO;
goto out; goto out;
@@ -253,7 +253,7 @@ int LUKS_hdr_restore(
goto out; goto out;
} }
if (read(devfd, buffer, buffer_size) < buffer_size) { if (read_buffer(devfd, buffer, buffer_size) < buffer_size) {
log_err(ctx, _("Cannot read header backup file %s.\n"), backup_file); log_err(ctx, _("Cannot read header backup file %s.\n"), backup_file);
r = -EIO; r = -EIO;
goto out; goto out;
@@ -498,7 +498,7 @@ int LUKS_read_phdr_backup(const char *backup_file,
return -ENOENT; return -ENOENT;
} }
if (read(devfd, hdr, hdr_size) < hdr_size) if (read_buffer(devfd, hdr, hdr_size) < hdr_size)
r = -EIO; r = -EIO;
else { else {
LUKS_fix_header_compatible(hdr); LUKS_fix_header_compatible(hdr);

3
lib/tcrypt/tcrypt.c
View File

@@ -469,8 +469,7 @@ static int TCRYPT_pool_keyfile(struct crypt_device *cd,
return -EIO; return -EIO;
} }
/* FIXME: add while */ data_size = read_buffer(fd, data, TCRYPT_KEYFILE_LEN);
data_size = read(fd, data, TCRYPT_KEYFILE_LEN);
close(fd); close(fd);
if (data_size < 0) { if (data_size < 0) {
log_err(cd, _("Error reading keyfile %s.\n"), keyfile); log_err(cd, _("Error reading keyfile %s.\n"), keyfile);

14
lib/utils.c
View File

@@ -137,7 +137,7 @@ ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
buf = orig_buf; buf = orig_buf;
if (solid) { if (solid) {
r = write(fd, buf, solid); r = write_buffer(fd, buf, solid);
if (r < 0 || r != (ssize_t)solid) if (r < 0 || r != (ssize_t)solid)
goto out; goto out;
} }
@@ -147,7 +147,7 @@ ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
if (!hangover_buf) if (!hangover_buf)
goto out; goto out;
r = read(fd, hangover_buf, bsize); r = read_buffer(fd, hangover_buf, bsize);
if (r < 0 || r < (ssize_t)hangover) if (r < 0 || r < (ssize_t)hangover)
goto out; goto out;
@@ -159,7 +159,7 @@ ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
memcpy(hangover_buf, (char*)buf + solid, hangover); memcpy(hangover_buf, (char*)buf + solid, hangover);
r = write(fd, hangover_buf, bsize); r = write_buffer(fd, hangover_buf, bsize);
if (r < 0 || r < (ssize_t)hangover) if (r < 0 || r < (ssize_t)hangover)
goto out; goto out;
} }
@@ -192,7 +192,7 @@ ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count) {
} else } else
buf = orig_buf; buf = orig_buf;
r = read(fd, buf, solid); r = read_buffer(fd, buf, solid);
if(r < 0 || r != (ssize_t)solid) if(r < 0 || r != (ssize_t)solid)
goto out; goto out;
@@ -200,7 +200,7 @@ ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count) {
hangover_buf = aligned_malloc(&hangover_buf_base, bsize, alignment); hangover_buf = aligned_malloc(&hangover_buf_base, bsize, alignment);
if (!hangover_buf) if (!hangover_buf)
goto out; goto out;
r = read(fd, hangover_buf, bsize); r = read_buffer(fd, hangover_buf, bsize);
if (r < 0 || r < (ssize_t)hangover) if (r < 0 || r < (ssize_t)hangover)
goto out; goto out;
@@ -243,7 +243,7 @@ ssize_t write_lseek_blockwise(int fd, int bsize, char *buf, size_t count, off_t
if (!frontPadBuf) if (!frontPadBuf)
goto out; goto out;
r = read(fd, frontPadBuf, bsize); r = read_buffer(fd, frontPadBuf, bsize);
if (r < 0 || r != bsize) if (r < 0 || r != bsize)
goto out; goto out;
@@ -256,7 +256,7 @@ ssize_t write_lseek_blockwise(int fd, int bsize, char *buf, size_t count, off_t
if (lseek(fd, offset - frontHang, SEEK_SET) < 0) if (lseek(fd, offset - frontHang, SEEK_SET) < 0)
goto out; goto out;
r = write(fd, frontPadBuf, bsize); r = write_buffer(fd, frontPadBuf, bsize);
if (r < 0 || r != bsize) if (r < 0 || r != bsize)
goto out; goto out;