dh/ima-evm-utils-mirror
1
0
Fork 0
mirror of https://git.code.sf.net/p/linux-ima/ima-evm-utils synced 2025-04-27 22:32:31 +02:00
Code Releases Activity

Revert "Reset 'errno' after failure to open or access a file"

Browse Source 
This reverts commit acb19d1894a4a95471b8d2346cd6c3ecf3385110, based on
the mailing list discussion and will be fixed in the next commit.

Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Link: https://lore.kernel.org/linux-integrity/20220915153659.dtykhzitxdrlpasq@altlinux.org/
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Mimi Zohar 2022-10-27 13:24:27 -04:00
parent 75fadad261
commit 0f3b9a0b2c
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/evmctl.c
View File

@ -182,7 +182,6 @@ static int bin2file(const char *file, const char *ext, const unsigned char *data
fp = fopen(name, "w");
if (!fp) {
log_err("Failed to open: %s\n", name);
errno = 0;
return -1;
}
err = fwrite(data, len, 1, fp);
@ -208,7 +207,6 @@ static unsigned char *file2bin(const char *file, const char *ext, int *size)
fp = fopen(name, "r");
if (!fp) {
log_err("Failed to open: %s\n", name);
errno = 0;
return NULL;
}
if (fstat(fileno(fp), &stats) == -1) {
@ -315,10 +313,8 @@ static int get_uuid(struct stat *st, char *uuid)
sprintf(path, "blkid -s UUID -o value /dev/block/%u:%u", major, minor);
fp = popen(path, "r");
if (!fp) {
errno = 0;
if (!fp)
goto err;
}
len = fread(_uuid, 1, sizeof(_uuid), fp);
pclose(fp);
@ -375,7 +371,6 @@ static int calc_evm_hash(const char *file, unsigned char *hash)
if (fd < 0) {
log_err("Failed to open: %s\n", file);
errno = 0;
return -1;
}
if (ioctl(fd, FS_IOC_GETVERSION, &generation)) {
@ -1201,7 +1196,6 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *h
if (fd < 0) {
log_err("Failed to open %s\n", file);
errno = 0;
goto out;
}
if (ioctl(fd, FS_IOC_GETVERSION, &generation)) {
@ -1392,7 +1386,6 @@ static int ima_fix(const char *path)
fd = open(path, O_RDONLY);
if (fd < 0) {
log_errno("Failed to open file: %s", path);
errno = 0;
return -1;
}
@ -1916,10 +1909,8 @@ static int read_sysfs_pcrs(int num_banks, struct tpm_bank_info *tpm_banks)
int i, result;
fp = fopen(pcrs, "r");
if (!fp) {
if (!fp)
fp = fopen(misc_pcrs, "r");
errno = 0;
}
if (!fp)
return -1;
@ -1982,7 +1973,6 @@ static int read_file_pcrs(int num_banks, struct tpm_bank_info *tpm_banks)
fp = fopen(path, "r");
if (!fp) {
log_err("Could not open '%s'\n", path);
errno = 0;
return -1;
}
@ -2075,7 +2065,6 @@ static int ima_measurement(const char *file)
fp = fopen(file, "rb");
if (!fp) {
log_err("Failed to open measurement file: %s\n", file);
errno = 0;
return -1;
}
@ -2321,7 +2310,6 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank)
fp = fopen(file, "r");
if (!fp) {
log_errno("Failed to open TPM 1.2 event log.\n");
errno = 0;
return 1;
}
@ -2758,8 +2746,6 @@ int main(int argc, char *argv[])
unsigned long keyid;
char *eptr;
errno = 0; /* initialize errno */
#if !(OPENSSL_VERSION_NUMBER < 0x10100000)
OPENSSL_init_crypto(
#ifndef DISABLE_OPENSSL_CONF

4
src/libimaevm.c
View File

@ -144,7 +144,6 @@ static int add_file_hash(const char *file, EVP_MD_CTX *ctx)
fp = fopen(file, "r");
if (!fp) {
log_err("Failed to open: %s\n", file);
errno = 0;
return -1;
}
@ -259,7 +258,6 @@ EVP_PKEY *read_pub_pkey(const char *keyfile, int x509)
if (!fp) {
if (imaevm_params.verbose > LOG_INFO)
log_info("Failed to open keyfile: %s\n", keyfile);
errno = 0;
return NULL;
}
@ -878,7 +876,6 @@ static int read_keyid_from_cert(uint32_t *keyid_be, const char *certfile, int tr
if (!(fp = fopen(certfile, "r"))) {
log_err("Cannot open %s: %s\n", certfile, strerror(errno));
errno = 0;
return -1;
}
if (!PEM_read_X509(fp, &x, NULL, NULL)) {
@ -970,7 +967,6 @@ static EVP_PKEY *read_priv_pkey(const char *keyfile, const char *keypass)
fp = fopen(keyfile, "r");
if (!fp) {
log_err("Failed to open keyfile: %s\n", keyfile);
errno = 0;
return NULL;
}
pkey = PEM_read_PrivateKey(fp, NULL, NULL, (void *)keypass);