projects
/
platform
/
upstream
/
cryptsetup.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some problems found by Coverity scan.
[platform/upstream/cryptsetup.git]
/
lib
/
utils.c
diff --git
a/lib/utils.c
b/lib/utils.c
index
de44e8b
..
2231522
100644
(file)
--- a/
lib/utils.c
+++ b/
lib/utils.c
@@
-105,7
+105,7
@@
ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
memcpy(hangover_buf, (char*)buf + solid, hangover);
r = write(fd, hangover_buf, bsize);
memcpy(hangover_buf, (char*)buf + solid, hangover);
r = write(fd, hangover_buf, bsize);
- if (r < 0 || r
!= bsize
)
+ if (r < 0 || r
< hangover
)
goto out;
}
ret = count;
goto out;
}
ret = count;
@@
-145,7
+145,7
@@
ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count) {
if (!hangover_buf)
goto out;
r = read(fd, hangover_buf, bsize);
if (!hangover_buf)
goto out;
r = read(fd, hangover_buf, bsize);
- if (r < 0 || r
!= bsize
)
+ if (r < 0 || r
< hangover
)
goto out;
memcpy((char *)buf + solid, hangover_buf, hangover);
goto out;
memcpy((char *)buf + solid, hangover_buf, hangover);
@@
-238,7
+238,7
@@
int crypt_memlock_inc(struct crypt_device *ctx)
log_err(ctx, _("Cannot get process priority.\n"));
else
if (setpriority(PRIO_PROCESS, 0, DEFAULT_PROCESS_PRIORITY))
log_err(ctx, _("Cannot get process priority.\n"));
else
if (setpriority(PRIO_PROCESS, 0, DEFAULT_PROCESS_PRIORITY))
- log_
err(ctx, _("setpriority %d failed: %s\n")
,
+ log_
dbg("setpriority %d failed: %s"
,
DEFAULT_PROCESS_PRIORITY, strerror(errno));
}
return _memlock_count ? 1 : 0;
DEFAULT_PROCESS_PRIORITY, strerror(errno));
}
return _memlock_count ? 1 : 0;
@@
-251,7
+251,7
@@
int crypt_memlock_dec(struct crypt_device *ctx)
if (munlockall() == -1)
log_err(ctx, _("Cannot unlock memory.\n"));
if (setpriority(PRIO_PROCESS, 0, _priority))
if (munlockall() == -1)
log_err(ctx, _("Cannot unlock memory.\n"));
if (setpriority(PRIO_PROCESS, 0, _priority))
- log_
err(ctx, _("setpriority %d failed: %s\n")
, _priority, strerror(errno));
+ log_
dbg("setpriority %d failed: %s"
, _priority, strerror(errno));
}
return _memlock_count ? 1 : 0;
}
}
return _memlock_count ? 1 : 0;
}