isa/make_ext4fs_old
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove selinux support code

Browse Source 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2015-04-04 22:42:53 +02:00
parent fb5c011b49
commit 58ace71d8c
4 changed files with 17 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext4_utils.h
View File

@ -158,7 +158,7 @@ struct selabel_handle;
int make_ext4fs_internal(int fd, const char *directory, int make_ext4fs_internal(int fd, const char *directory,
const char *mountpoint, fs_config_func_t fs_config_func, int gzip, const char *mountpoint, fs_config_func_t fs_config_func, int gzip,
int sparse, int crc, int wipe, int sparse, int crc, int wipe,
struct selabel_handle *sehnd, int verbose, time_t fixed_time, int verbose, time_t fixed_time,
FILE* block_list_file); FILE* block_list_file);
int read_ext(int fd, int verbose); int read_ext(int fd, int verbose);

99
make_ext4fs.c
View File

@ -35,34 +35,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef USE_MINGW #ifndef USE_MINGW
#include <winsock2.h>
/* These match the Linux definitions of these flags.
L_xx is defined to avoid conflicting with the win32 versions.
*/
#define L_S_IRUSR 00400
#define L_S_IWUSR 00200
#define L_S_IXUSR 00100
#define S_IRWXU (L_S_IRUSR | L_S_IWUSR | L_S_IXUSR)
#define S_IRGRP 00040
#define S_IWGRP 00020
#define S_IXGRP 00010
#define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP)
#define S_IROTH 00004
#define S_IWOTH 00002
#define S_IXOTH 00001
#define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH)
#define S_ISUID 0004000
#define S_ISGID 0002000
#define S_ISVTX 0001000
#else
#include <selinux/selinux.h>
#include <selinux/label.h>
#include <selinux/android.h>
#define O_BINARY 0 #define O_BINARY 0
@ -79,8 +52,7 @@ static int filter_dot(const struct dirent *d)
return (strcmp(d->d_name, "..") && strcmp(d->d_name, ".")); return (strcmp(d->d_name, "..") && strcmp(d->d_name, "."));
} }
static u32 build_default_directory_structure(const char *dir_path, static u32 build_default_directory_structure(const char *dir_path)
struct selabel_handle *sehnd)
{ {
u32 inode; u32 inode;
u32 root_inode; u32 root_inode;
@ -98,22 +70,6 @@ static u32 build_default_directory_structure(const char *dir_path,
inode_set_permissions(inode, dentries.mode, inode_set_permissions(inode, dentries.mode,
dentries.uid, dentries.gid, dentries.mtime); dentries.uid, dentries.gid, dentries.mtime);
#ifndef USE_MINGW
if (sehnd) {
char *path = NULL;
char *secontext = NULL;
asprintf(&path, "%slost+found", dir_path);
if (selabel_lookup(sehnd, &secontext, path, S_IFDIR) < 0) {
error("cannot lookup security context for %s", path);
} else {
inode_set_selinux(inode, secontext);
freecon(secontext);
}
free(path);
}
#endif
return root_inode; return root_inode;
} }
@ -127,7 +83,7 @@ static u32 build_default_directory_structure(const char *dir_path,
if the image were mounted at the specified mount point */ if the image were mounted at the specified mount point */
static u32 build_directory_structure(const char *full_path, const char *dir_path, static u32 build_directory_structure(const char *full_path, const char *dir_path,
u32 dir_inode, fs_config_func_t fs_config_func, u32 dir_inode, fs_config_func_t fs_config_func,
struct selabel_handle *sehnd, int verbose, time_t fixed_time) int verbose, time_t fixed_time)
{ {
int entries = 0; int entries = 0;
struct dentry *dentries; struct dentry *dentries;
@ -212,16 +168,6 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path
error("can't set android permissions - built without android support"); error("can't set android permissions - built without android support");
#endif #endif
} }
#ifndef USE_MINGW
if (sehnd) {
if (selabel_lookup(sehnd, &dentries[i].secon, dentries[i].path, stat.st_mode) < 0) {
error("cannot lookup security context for %s", dentries[i].path);
}
if (dentries[i].secon && verbose)
printf("Labeling %s as %s\n", dentries[i].path, dentries[i].secon);
}
#endif
if (S_ISREG(stat.st_mode)) { if (S_ISREG(stat.st_mode)) {
dentries[i].file_type = EXT4_FT_REG_FILE; dentries[i].file_type = EXT4_FT_REG_FILE;
@ -263,10 +209,6 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path
dentries[0].file_type = EXT4_FT_DIR; dentries[0].file_type = EXT4_FT_DIR;
dentries[0].uid = 0; dentries[0].uid = 0;
dentries[0].gid = 0; dentries[0].gid = 0;
if (sehnd) {
if (selabel_lookup(sehnd, &dentries[0].secon, dentries[0].path, dentries[0].mode) < 0)
error("cannot lookup security context for %s", dentries[0].path);
}
entries++; entries++;
dirs++; dirs++;
} }
@ -288,7 +230,7 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path
if (ret < 0) if (ret < 0)
critical_error_errno("asprintf"); critical_error_errno("asprintf");
entry_inode = build_directory_structure(subdir_full_path, entry_inode = build_directory_structure(subdir_full_path,
subdir_dir_path, inode, fs_config_func, sehnd, verbose, fixed_time); subdir_dir_path, inode, fs_config_func, verbose, fixed_time);
free(subdir_full_path); free(subdir_full_path);
free(subdir_dir_path); free(subdir_dir_path);
} else if (dentries[i].file_type == EXT4_FT_SYMLINK) { } else if (dentries[i].file_type == EXT4_FT_SYMLINK) {
@ -401,16 +343,16 @@ void reset_ext4fs_info() {
} }
int make_ext4fs_sparse_fd(int fd, long long len, int make_ext4fs_sparse_fd(int fd, long long len,
const char *mountpoint, struct selabel_handle *sehnd) const char *mountpoint)
{ {
reset_ext4fs_info(); reset_ext4fs_info();
info.len = len; info.len = len;
return make_ext4fs_internal(fd, NULL, mountpoint, NULL, 0, 1, 0, 0, sehnd, 0, -1, NULL); return make_ext4fs_internal(fd, NULL, mountpoint, NULL, 0, 1, 0, 0, 0, -1, NULL);
} }
int make_ext4fs(const char *filename, long long len, int make_ext4fs(const char *filename, long long len,
const char *mountpoint, struct selabel_handle *sehnd) const char *mountpoint)
{ {
int fd; int fd;
int status; int status;
@ -424,7 +366,7 @@ int make_ext4fs(const char *filename, long long len,
return EXIT_FAILURE; return EXIT_FAILURE;
} }
status = make_ext4fs_internal(fd, NULL, mountpoint, NULL, 0, 0, 0, 1, sehnd, 0, -1, NULL); status = make_ext4fs_internal(fd, NULL, mountpoint, NULL, 0, 0, 0, 1, 0, -1, NULL);
close(fd); close(fd);
return status; return status;
@ -493,7 +435,7 @@ static char *canonicalize_rel_slashes(const char *str)
int make_ext4fs_internal(int fd, const char *_directory, int make_ext4fs_internal(int fd, const char *_directory,
const char *_mountpoint, fs_config_func_t fs_config_func, int gzip, const char *_mountpoint, fs_config_func_t fs_config_func, int gzip,
int sparse, int crc, int wipe, int sparse, int crc, int wipe,
struct selabel_handle *sehnd, int verbose, time_t fixed_time, int verbose, time_t fixed_time,
FILE* block_list_file) FILE* block_list_file)
{ {
u32 root_inode_num; u32 root_inode_num;
@ -599,35 +541,18 @@ int make_ext4fs_internal(int fd, const char *_directory,
#ifdef USE_MINGW #ifdef USE_MINGW
// Windows needs only 'create an empty fs image' functionality // Windows needs only 'create an empty fs image' functionality
assert(!directory); assert(!directory);
root_inode_num = build_default_directory_structure(mountpoint, sehnd); root_inode_num = build_default_directory_structure(mountpoint);
#else #else
if (directory) if (directory)
root_inode_num = build_directory_structure(directory, mountpoint, 0, root_inode_num = build_directory_structure(directory, mountpoint, 0,
fs_config_func, sehnd, verbose, fixed_time); fs_config_func, verbose, fixed_time);
else else
root_inode_num = build_default_directory_structure(mountpoint, sehnd); root_inode_num = build_default_directory_structure(mountpoint);
#endif #endif
root_mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; root_mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
inode_set_permissions(root_inode_num, root_mode, 0, 0, 0); inode_set_permissions(root_inode_num, root_mode, 0, 0, 0);
#ifndef USE_MINGW
if (sehnd) {
char *secontext = NULL;
if (selabel_lookup(sehnd, &secontext, mountpoint, S_IFDIR) < 0) {
error("cannot lookup security context for %s", mountpoint);
}
if (secontext) {
if (verbose) {
printf("Labeling %s as %s\n", mountpoint, secontext);
}
inode_set_selinux(root_inode_num, secontext);
}
freecon(secontext);
}
#endif
ext4_update_free(); ext4_update_free();
ext4_queue_sb(); ext4_queue_sb();

6
make_ext4fs.h
View File

@ -21,12 +21,10 @@
extern "C" { extern "C" {
#endif #endif
struct selabel_handle;
int make_ext4fs(const char *filename, long long len, int make_ext4fs(const char *filename, long long len,
const char *mountpoint, struct selabel_handle *sehnd); const char *mountpoint);
int make_ext4fs_sparse_fd(int fd, long long len, int make_ext4fs_sparse_fd(int fd, long long len,
const char *mountpoint, struct selabel_handle *sehnd); const char *mountpoint);
#ifdef __cplusplus #ifdef __cplusplus
} }

40
make_ext4fs_main.c
View File

@ -29,14 +29,6 @@
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
#endif #endif
#ifndef USE_MINGW
#include <selinux/selinux.h>
#include <selinux/label.h>
#include <selinux/android.h>
#else
struct selabel_handle;
#endif
#include "make_ext4fs.h" #include "make_ext4fs.h"
#include "ext4_utils.h" #include "ext4_utils.h"
#include "canned_fs_config.h" #include "canned_fs_config.h"
@ -74,13 +66,9 @@ int main(int argc, char **argv)
int exitcode; int exitcode;
int verbose = 0; int verbose = 0;
time_t fixed_time = -1; time_t fixed_time = -1;
struct selabel_handle *sehnd = NULL;
FILE* block_list_file = NULL; FILE* block_list_file = NULL;
#ifndef USE_MINGW
struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } };
#endif
while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:S:T:C:B:fwzJsctv")) != -1) { while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:T:C:B:fwzJsctv")) != -1) {
switch (opt) { switch (opt) {
case 'l': case 'l':
info.len = parse_num(optarg); info.len = parse_num(optarg);
@ -133,16 +121,6 @@ int main(int argc, char **argv)
case 't': case 't':
fprintf(stderr, "Warning: -t (initialize inode tables) is deprecated\n"); fprintf(stderr, "Warning: -t (initialize inode tables) is deprecated\n");
break; break;
case 'S':
#ifndef USE_MINGW
seopts[0].value = optarg;
sehnd = selabel_open(SELABEL_CTX_FILE, seopts, 1);
if (!sehnd) {
perror(optarg);
exit(EXIT_FAILURE);
}
#endif
break;
case 'v': case 'v':
verbose = 1; verbose = 1;
break; break;
@ -165,26 +143,12 @@ int main(int argc, char **argv)
} }
} }
#if !defined(HOST)
// Use only if -S option not requested
if (!sehnd && mountpoint) {
sehnd = selinux_android_file_context_handle();
if (!sehnd) {
perror(optarg);
exit(EXIT_FAILURE);
}
}
#endif
if (fs_config_file) { if (fs_config_file) {
if (load_canned_fs_config(fs_config_file) < 0) { if (load_canned_fs_config(fs_config_file) < 0) {
fprintf(stderr, "failed to load %s\n", fs_config_file); fprintf(stderr, "failed to load %s\n", fs_config_file);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
fs_config_func = canned_fs_config; fs_config_func = canned_fs_config;
} else if (mountpoint) {
fs_config_func = fs_config;
} }
if (wipe && sparse) { if (wipe && sparse) {
@ -227,7 +191,7 @@ int main(int argc, char **argv)
} }
exitcode = make_ext4fs_internal(fd, directory, mountpoint, fs_config_func, gzip, exitcode = make_ext4fs_internal(fd, directory, mountpoint, fs_config_func, gzip,
sparse, crc, wipe, sehnd, verbose, fixed_time, block_list_file); sparse, crc, wipe, verbose, fixed_time, block_list_file);
close(fd); close(fd);
if (block_list_file) if (block_list_file)
fclose(block_list_file); fclose(block_list_file);