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

Fix time of check/use Coverity report (and ignore another) in device utils.

Browse Source
This commit is contained in:
Milan Broz
2012-12-17 15:19:57 +01:00
parent 94d732b411
commit a83cc1dbf4
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/utils_device.c
View File

@@ -44,20 +44,16 @@ static int device_ready(const char *device)
int devfd, r = 0; int devfd, r = 0;
struct stat st; struct stat st;
if(stat(device, &st) < 0) {
log_err(NULL, _("Device %s doesn't exist or access denied.\n"), device);
return -EINVAL;
}
if (!S_ISBLK(st.st_mode))
return S_ISREG(st.st_mode) ? -ENOTBLK : -EINVAL;
log_dbg("Trying to open and read device %s.", device); log_dbg("Trying to open and read device %s.", device);
devfd = open(device, O_RDONLY | O_DIRECT | O_SYNC); devfd = open(device, O_RDONLY | O_DIRECT | O_SYNC);
if (devfd < 0) { if (devfd < 0) {
log_err(NULL, _("Cannot open device %s.\n"), device); log_err(NULL, _("Device %s doesn't exist or access denied.\n"), device);
return -EINVAL; return -EINVAL;
} }
if (fstat(devfd, &st) < 0)
r = -EINVAL;
else if (!S_ISBLK(st.st_mode))
r = S_ISREG(st.st_mode) ? -ENOTBLK : -EINVAL;
close(devfd); close(devfd);
return r; return r;
@@ -282,6 +278,7 @@ static int device_info(struct device *device,
flags |= O_EXCL; flags |= O_EXCL;
/* Try to open read-write to check whether it is a read-only device */ /* Try to open read-write to check whether it is a read-only device */
/* coverity[toctou] */
fd = open(device->path, O_RDWR | flags); fd = open(device->path, O_RDWR | flags);
if (fd == -1 && errno == EROFS) { if (fd == -1 && errno == EROFS) {
*readonly = 1; *readonly = 1;