X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Futils.c;h=eef78911e0b49a589fc581dcc45dd5f70ed16e0a;hb=50d5cfa8bce833469197c4ffcc284d5f07245c7a;hp=25f370f423af520b39aec8a8a1887acbbafbc8ff;hpb=ee8425b8365532217c5aa132a5d80eae1d3881df;p=platform%2Fupstream%2Fcryptsetup.git diff --git a/lib/utils.c b/lib/utils.c index 25f370f..eef7891 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -22,22 +22,18 @@ #include #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include #include #include -#include "libcryptsetup.h" #include "internal.h" +unsigned crypt_getpagesize(void) +{ + long r = sysconf(_SC_PAGESIZE); + return r < 0 ? DEFAULT_MEM_ALIGNMENT : r; +} + static int get_alignment(int fd) { int alignment = DEFAULT_MEM_ALIGNMENT; @@ -69,52 +65,15 @@ static void *aligned_malloc(void **base, int size, int alignment) #endif } -int device_read_ahead(const char *dev, uint32_t *read_ahead) -{ - int fd, r = 0; - long read_ahead_long; - - if ((fd = open(dev, O_RDONLY)) < 0) - return 0; - - r = ioctl(fd, BLKRAGET, &read_ahead_long) ? 0 : 1; - close(fd); - - if (r) - *read_ahead = (uint32_t) read_ahead_long; - - return r; -} - -static int sector_size(int fd) -{ - int bsize; - if (ioctl(fd,BLKSSZGET, &bsize) < 0) - return -EINVAL; - else - return bsize; -} - -int sector_size_for_device(const char *device) -{ - int fd = open(device, O_RDONLY); - int r; - if(fd < 0) - return -EINVAL; - r = sector_size(fd); - close(fd); - return r; -} - -ssize_t write_blockwise(int fd, void *orig_buf, size_t count) +ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count) { void *hangover_buf, *hangover_buf_base = NULL; void *buf, *buf_base = NULL; - int r, hangover, solid, bsize, alignment; + int r, hangover, solid, alignment; ssize_t ret = -1; - if ((bsize = sector_size(fd)) < 0) - return bsize; + if (fd == -1 || !orig_buf || bsize <= 0) + return -1; hangover = count % bsize; solid = count - hangover; @@ -147,7 +106,7 @@ ssize_t write_blockwise(int fd, void *orig_buf, size_t count) 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; @@ -158,14 +117,14 @@ out: return ret; } -ssize_t read_blockwise(int fd, void *orig_buf, size_t count) { +ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count) { void *hangover_buf, *hangover_buf_base = NULL; void *buf, *buf_base = NULL; - int r, hangover, solid, bsize, alignment; + int r, hangover, solid, alignment; ssize_t ret = -1; - if ((bsize = sector_size(fd)) < 0) - return bsize; + if (fd == -1 || !orig_buf || bsize <= 0) + return -1; hangover = count % bsize; solid = count - hangover; @@ -187,7 +146,7 @@ ssize_t read_blockwise(int fd, void *orig_buf, size_t count) { 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); @@ -208,15 +167,15 @@ out: * is implicitly included in the read/write offset, which can not be set to non-aligned * boundaries. Hence, we combine llseek with write. */ -ssize_t write_lseek_blockwise(int fd, char *buf, size_t count, off_t offset) { +ssize_t write_lseek_blockwise(int fd, int bsize, char *buf, size_t count, off_t offset) { char *frontPadBuf; void *frontPadBuf_base = NULL; - int r, bsize, frontHang; + int r, frontHang; size_t innerCount = 0; ssize_t ret = -1; - if ((bsize = sector_size(fd)) < 0) - return bsize; + if (fd == -1 || !buf || bsize <= 0) + return -1; frontHang = offset % bsize; @@ -250,7 +209,7 @@ ssize_t write_lseek_blockwise(int fd, char *buf, size_t count, off_t offset) { count -= innerCount; } - ret = count ? write_blockwise(fd, buf, count) : 0; + ret = count ? write_blockwise(fd, bsize, buf, count) : 0; if (ret >= 0) ret += innerCount; out: @@ -259,182 +218,6 @@ out: return ret; } -int device_ready(struct crypt_device *cd, const char *device, int mode) -{ - int devfd, r = 0; - ssize_t s; - struct stat st; - char buf[512]; - - if(stat(device, &st) < 0) { - log_err(cd, _("Device %s doesn't exist or access denied.\n"), device); - return -EINVAL; - } - - if (!S_ISBLK(st.st_mode)) - return -ENOTBLK; - - log_dbg("Trying to open and read device %s.", device); - devfd = open(device, mode | O_DIRECT | O_SYNC); - if(devfd < 0) { - log_err(cd, _("Cannot open device %s for %s%s access.\n"), device, - (mode & O_EXCL) ? _("exclusive ") : "", - (mode & O_RDWR) ? _("writable") : _("read-only")); - return -EINVAL; - } - - /* Try to read first sector */ - s = read_blockwise(devfd, buf, sizeof(buf)); - if (s < 0 || s != sizeof(buf)) { - log_verbose(cd, _("Cannot read device %s.\n"), device); - r = -EIO; - } - - memset(buf, 0, sizeof(buf)); - close(devfd); - - return r; -} - -int device_size(const char *device, uint64_t *size) -{ - int devfd, r = 0; - - devfd = open(device, O_RDONLY); - if(devfd == -1) - return -EINVAL; - - if (ioctl(devfd, BLKGETSIZE64, size) < 0) - r = -EINVAL; - - close(devfd); - return r; -} - -static int get_device_infos(const char *device, enum devcheck device_check, - int *readonly, uint64_t *size) -{ - struct stat st; - unsigned long size_small; - int fd, r = -1; - int flags = 0; - - *readonly = 0; - *size = 0; - - if (stat(device, &st) < 0) - return -EINVAL; - - /* never wipe header on mounted device */ - if (device_check == DEV_EXCL && S_ISBLK(st.st_mode)) - flags |= O_EXCL; - - /* Try to open read-write to check whether it is a read-only device */ - fd = open(device, O_RDWR | flags); - if (fd == -1 && errno == EROFS) { - *readonly = 1; - fd = open(device, O_RDONLY | flags); - } - - if (fd == -1 && device_check == DEV_EXCL && errno == EBUSY) - return -EBUSY; - - if (fd == -1) - return -EINVAL; - - /* If the device can be opened read-write, i.e. readonly is still 0, then - * check whether BKROGET says that it is read-only. E.g. read-only loop - * devices may be openend read-write but are read-only according to BLKROGET - */ - if (*readonly == 0 && (r = ioctl(fd, BLKROGET, readonly)) < 0) - goto out; - - if (ioctl(fd, BLKGETSIZE64, size) >= 0) { - *size >>= SECTOR_SHIFT; - r = 0; - goto out; - } - - if (ioctl(fd, BLKGETSIZE, &size_small) >= 0) { - *size = (uint64_t)size_small; - r = 0; - goto out; - } - - r = -EINVAL; -out: - close(fd); - return r; -} - -int device_check_and_adjust(struct crypt_device *cd, - const char *device, - enum devcheck device_check, - uint64_t *size, - uint64_t *offset, - uint32_t *flags) -{ - int r, real_readonly; - uint64_t real_size; - - if (!device) - return -ENOTBLK; - - r = get_device_infos(device, device_check, &real_readonly, &real_size); - if (r < 0) { - if (r == -EBUSY) - log_err(cd, _("Cannot use device %s which is in use " - "(already mapped or mounted).\n"), - device); - else - log_err(cd, _("Cannot get info about device %s.\n"), - device); - return r; - } - - if (*offset >= real_size) { - log_err(cd, _("Requested offset is beyond real size of device %s.\n"), - device); - return -EINVAL; - } - - if (!*size) { - *size = real_size; - if (!*size) { - log_err(cd, _("Device %s has zero size.\n"), device); - return -ENOTBLK; - } - *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) { - log_dbg("Checking crypt segments for device %s.", device); - r = crypt_sysfs_check_crypt_segment(device, *offset, *size); - if (r < 0) { - log_err(cd, _("Cannot use device %s (crypt segments " - "overlaps or in use by another device).\n"), - device); - return r; - } - } - - if (real_readonly) - *flags |= CRYPT_ACTIVATE_READONLY; - - log_dbg("Calculated device size is %" PRIu64 " sectors (%s), offset %" PRIu64 ".", - *size, real_readonly ? "RO" : "RW", *offset); - return 0; -} - /* MEMLOCK */ #define DEFAULT_PROCESS_PRIORITY -18 @@ -447,7 +230,7 @@ int crypt_memlock_inc(struct crypt_device *ctx) if (!_memlock_count++) { log_dbg("Locking memory."); if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1) { - log_err(ctx, _("WARNING!!! Possibly insecure memory. Are you root?\n")); + log_dbg("Cannot lock memory with mlockall."); _memlock_count--; return 0; } @@ -456,7 +239,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, _("setpriority %d failed: %s\n"), + log_dbg("setpriority %d failed: %s", DEFAULT_PROCESS_PRIORITY, strerror(errno)); } return _memlock_count ? 1 : 0; @@ -469,64 +252,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)) - 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; } - -/* DEVICE TOPOLOGY */ - -/* block device topology ioctls, introduced in 2.6.32 */ -#ifndef BLKIOMIN -#define BLKIOMIN _IO(0x12,120) -#define BLKIOOPT _IO(0x12,121) -#define BLKALIGNOFF _IO(0x12,122) -#endif - -void get_topology_alignment(const char *device, - unsigned long *required_alignment, /* bytes */ - unsigned long *alignment_offset, /* bytes */ - unsigned long default_alignment) -{ - int dev_alignment_offset = 0; - unsigned int min_io_size = 0, opt_io_size = 0; - unsigned long temp_alignment = 0; - int fd; - - *required_alignment = default_alignment; - *alignment_offset = 0; - - fd = open(device, O_RDONLY); - if (fd == -1) - return; - - /* minimum io size */ - if (ioctl(fd, BLKIOMIN, &min_io_size) == -1) { - log_dbg("Topology info for %s not supported, using default offset %lu bytes.", - device, default_alignment); - goto out; - } - - /* optimal io size */ - if (ioctl(fd, BLKIOOPT, &opt_io_size) == -1) - opt_io_size = min_io_size; - - /* alignment offset, bogus -1 means misaligned/unknown */ - if (ioctl(fd, BLKALIGNOFF, &dev_alignment_offset) == -1 || dev_alignment_offset < 0) - dev_alignment_offset = 0; - *alignment_offset = (unsigned long)dev_alignment_offset; - - temp_alignment = (unsigned long)min_io_size; - - if (temp_alignment < (unsigned long)opt_io_size) - temp_alignment = (unsigned long)opt_io_size; - - /* If calculated alignment is multiple of default, keep default */ - if (temp_alignment && (default_alignment % temp_alignment)) - *required_alignment = temp_alignment; - - log_dbg("Topology: IO (%u/%u), offset = %lu; Required alignment is %lu bytes.", - min_io_size, opt_io_size, *alignment_offset, *required_alignment); -out: - (void)close(fd); -}