diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2010-12-13 10:43:56 +0000 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2010-12-13 10:43:56 +0000 |
| commit | 7dfce0e46762d25d7fe253693a66d45a357dbb69 (patch) | |
| tree | b97b35821582d3270af7cab2d23ea214e484b6fb /lib/locking/file_locking.c | |
| parent | bda30a59b930ee6c88b41ced9c6a6c16b80f7675 (diff) | |
| download | lvm2-7dfce0e46762d25d7fe253693a66d45a357dbb69.tar.gz lvm2-7dfce0e46762d25d7fe253693a66d45a357dbb69.tar.xz lvm2-7dfce0e46762d25d7fe253693a66d45a357dbb69.zip | |
Add new dm_prepare_selinux_context fn to libdevmapper and use it throughout.
Detect existence of new SELinux selabel interface during configure.
Use new dm_prepare_selinux_context instead of dm_set_selinux_context.
We should set the SELinux context before the actual file system object creation.
The new dm_prepare_selinux_context function sets this using the selabel_lookup
fn in conjuction with the setfscreatecon fn. If selinux/label.h interface
(that should be a part of the selinux library) is not found during configure,
we fallback to the original matchpathcon function instead.
Diffstat (limited to 'lib/locking/file_locking.c')
| -rw-r--r-- | lib/locking/file_locking.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index ed1ccd57..9137a30a 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -234,10 +234,12 @@ static int _lock_file(const char *file, uint32_t flags) log_very_verbose("Locking %s %c%c", ll->res, state, nonblock ? ' ' : 'B'); + (void) dm_prepare_selinux_context(file, S_IFREG); if (_prioritise_write_locks) r = _do_write_priority_flock(file, &ll->lf, operation, nonblock); else r = _do_flock(file, &ll->lf, operation, nonblock); + (void) dm_prepare_selinux_context(NULL, 0); if (r) dm_list_add(&_lock_list, &ll->list); @@ -325,6 +327,7 @@ int init_file_locking(struct locking_type *locking, struct cmd_context *cmd) locking->reset_locking = _reset_file_locking; locking->fin_locking = _fin_file_locking; locking->flags = 0; + int r; /* Get lockfile directory from config file */ strncpy(_lock_dir, find_config_tree_str(cmd, "global/locking_dir", @@ -335,7 +338,11 @@ int init_file_locking(struct locking_type *locking, struct cmd_context *cmd) find_config_tree_bool(cmd, "global/prioritise_write_locks", DEFAULT_PRIORITISE_WRITE_LOCKS); - if (!dm_create_dir(_lock_dir)) + (void) dm_prepare_selinux_context(_lock_dir, S_IFDIR); + r = dm_create_dir(_lock_dir); + (void) dm_prepare_selinux_context(NULL, 0); + + if (!r) return 0; /* Trap a read-only file system */ |