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

Improve check for invalid offset and size values. (thx to okozina)

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@588 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2011-08-01 12:27:34 +00:00
parent 6361e86daf
commit 7665f8e805
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -1,5 +1,6 @@
2011-07-25 Milan Broz <mbroz@redhat.com> 2011-07-25 Milan Broz <mbroz@redhat.com>
* Remove hash/hmac restart from crypto backend and make it part of hash/hmac final. * Remove hash/hmac restart from crypto backend and make it part of hash/hmac final.
* Improve check for invalid offset and size values.
2011-07-19 Milan Broz <mbroz@redhat.com> 2011-07-19 Milan Broz <mbroz@redhat.com>
* Revert default initialisation of volume key in crypt_init_by_name(). * Revert default initialisation of volume key in crypt_init_by_name().

19
lib/utils.c
View File

@@ -432,19 +432,30 @@ int device_check_and_adjust(struct crypt_device *cd,
return r; return r;
} }
if (*offset >= real_size) {
log_err(cd, _("Requested offset is beyond real size of device %s.\n"),
device);
return -EINVAL;
}
if (!*size) { if (!*size) {
*size = real_size; *size = real_size;
if (!*size) { if (!*size) {
log_err(cd, _("Device %s has zero size.\n"), device); log_err(cd, _("Device %s has zero size.\n"), device);
return -ENOTBLK; return -ENOTBLK;
} }
if (*size < *offset) {
log_err(cd, _("Device %s is too small.\n"), device);
return -EINVAL;
}
*size -= *offset; *size -= *offset;
} }
/* in case of size is set by parameter */
if ((real_size - *offset) < *size) {
log_dbg("Device %s: offset = %" PRIu64 " requested size = %" PRIu64
", backing device size = %" PRIu64,
device, *offset, *size, real_size);
log_err(cd, _("Device %s is too small.\n"), device);
return -EINVAL;
}
if (device_check == DEV_SHARED) { if (device_check == DEV_SHARED) {
log_dbg("Checking crypt segments for device %s.", device); log_dbg("Checking crypt segments for device %s.", device);
r = crypt_sysfs_check_crypt_segment(device, *offset, *size); r = crypt_sysfs_check_crypt_segment(device, *offset, *size);

6
src/cryptsetup.c
View File

@@ -29,6 +29,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <assert.h> #include <assert.h>
#include <limits.h>
#include <libcryptsetup.h> #include <libcryptsetup.h>
#include <popt.h> #include <popt.h>
@@ -1204,8 +1205,11 @@ int main(int argc, const char **argv)
unsigned long long ull_value; unsigned long long ull_value;
char *endp; char *endp;
errno = 0;
ull_value = strtoull(popt_tmp, &endp, 0); ull_value = strtoull(popt_tmp, &endp, 0);
if (*endp || !*popt_tmp) if (*endp || !*popt_tmp ||
(errno == ERANGE && ull_value == ULLONG_MAX) ||
(errno != 0 && ull_value == 0))
r = POPT_ERROR_BADNUMBER; r = POPT_ERROR_BADNUMBER;
switch(r) { switch(r) {