dh/ima-evm-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove local ioctl definitions and use <linux/fs.h>

Browse Source 
Use standard flags, supported by ext2/3/4

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
This commit is contained in:
Dmitry Kasatkin 2014-06-13 14:39:48 +03:00
parent 0636083acd
commit 29adc34d35
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/evmctl.c
View File

@ -529,7 +529,7 @@ static int calc_evm_hash(const char *file, unsigned char *hash)
log_err("Unable to open %s\n", file); log_err("Unable to open %s\n", file);
return -1; return -1;
} }
if (ioctl(fd, EXT34_IOC_GETVERSION, &generation)) { if (ioctl(fd, FS_IOC_GETVERSION, &generation)) {
log_err("ioctl() failed\n"); log_err("ioctl() failed\n");
return -1; return -1;
} }
@ -1082,7 +1082,7 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *h
log_err("Unable to open %s\n", file); log_err("Unable to open %s\n", file);
goto out; goto out;
} }
if (ioctl(fd, EXT34_IOC_GETVERSION, &generation)) { if (ioctl(fd, FS_IOC_GETVERSION, &generation)) {
log_err("ioctl() failed\n"); log_err("ioctl() failed\n");
goto out; goto out;
} }

9
src/imaevm.h
View File

@ -41,6 +41,7 @@
#ifndef _LIBIMAEVM_H #ifndef _LIBIMAEVM_H
#define _LIBIMAEVM_H #define _LIBIMAEVM_H
#include <linux/fs.h>
#include <stdint.h> #include <stdint.h>
#include <syslog.h> #include <syslog.h>
#include <stdbool.h> #include <stdbool.h>
@ -74,14 +75,6 @@
#define DATA_SIZE 4096 #define DATA_SIZE 4096
#define SHA1_HASH_LEN 20 #define SHA1_HASH_LEN 20
#define EXT2_IOC_GETVERSION _IOR('v', 1, long)
#define EXT34_IOC_GETVERSION _IOR('f', 3, long)
#define FS_IOC_GETFLAGS _IOR('f', 1, long)
#define FS_IOC_SETFLAGS _IOW('f', 2, long)
#define FS_IOC32_GETFLAGS _IOR('f', 1, int)
#define FS_IOC32_SETFLAGS _IOW('f', 2, int)
#define __packed __attribute__((packed)) #define __packed __attribute__((packed))
enum evm_ima_xattr_type { enum evm_ima_xattr_type {