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

Remove code duplication

Browse Source 
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
This commit is contained in:
Dmitry Kasatkin 2014-06-25 18:12:19 +03:00
parent 02594d3003
commit 0636083acd
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/evmctl.c
View File

@ -84,6 +84,7 @@ struct command {
static int g_argc; static int g_argc;
static char **g_argv; static char **g_argv;
static int xattr = 1; static int xattr = 1;
static bool check_xattr;
static int sigdump; static int sigdump;
static int digest; static int digest;
static int digsig; static int digsig;
@ -749,6 +750,8 @@ static int get_file_type(const char *path, const char *search_type)
dts |= DIR_MASK; break; dts |= DIR_MASK; break;
case 's': case 's':
dts |= BLK_MASK | CHR_MASK | LNK_MASK; break; dts |= BLK_MASK | CHR_MASK | LNK_MASK; break;
case 'x':
check_xattr = true; break;
case 'm': case 'm':
/* stay within the same filesystem*/ /* stay within the same filesystem*/
err = lstat(path, &st); err = lstat(path, &st);
@ -1227,7 +1230,7 @@ static int ima_fix(const char *path)
log_info("%s\n", path); log_info("%s\n", path);
if (xattr) { if (check_xattr) {
/* re-measuring takes a time /* re-measuring takes a time
* in some cases we can skip labeling if xattrs exists * in some cases we can skip labeling if xattrs exists
*/ */
@ -1312,7 +1315,6 @@ static int cmd_ima_fix(struct command *cmd)
{ {
char *path = g_argv[optind++]; char *path = g_argv[optind++];
int err, dts = REG_MASK; /* only regular files by default */ int err, dts = REG_MASK; /* only regular files by default */
struct stat st;
if (!path) { if (!path) {
log_err("Parameters missing\n"); log_err("Parameters missing\n");
@ -1320,41 +1322,18 @@ static int cmd_ima_fix(struct command *cmd)
return -1; return -1;
} }
xattr = 0; /* do not check xattrs, fix everything */ if (recursive) {
if (search_type) {
if (search_type) { dts = get_file_type(path, search_type);
int i; if (dts < 0)
return dts;
dts = 0;
for (i = 0; search_type[i]; i++) {
switch (search_type[i]) {
case 'f':
dts |= REG_MASK; break;
case 'd':
dts |= DIR_MASK; break;
case 's':
dts |= BLK_MASK | CHR_MASK | LNK_MASK; break;
case 'x':
/* check xattrs */
xattr = 1; break;
case 'm':
/* stay within the same filesystem*/
err = lstat(path, &st);
if (err < 0) {
log_err("stat() failed\n");
return err;
}
fs_dev = st.st_dev; /* filesystem to start from */
break;
}
} }
err = find(path, dts, ima_fix);
} else {
err = ima_fix(path);
} }
err = find(path, dts, ima_fix); return err;
if (err)
return err;
return 0;
} }