Rafal Krypa [Thu, 13 Feb 2014 13:33:20 +0000 (14:33 +0100)]
libsmack: reorganize rule lists for struct smack_accesses
Until now rule list was implemented as single linked list of all rules
added into struct smack_accesses. This patch breaks this list into several
lists, with one list of rules per subject label.
Each element in array of labels describe single label and all rules when it's a
subject are added into this label's list.
This data structure is close to internal kernel data structures for Smack
rules. This allows for slightly better performance because rules are
grouped by subject.
More importantly though, this patch prepares ground for rule merging.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Thu, 13 Feb 2014 13:16:40 +0000 (14:16 +0100)]
libsmack: shrink few rule and label struct fields
Use smaller struct fields to optimize memory usage and speed.
On a 32-bit machine this saves 4 bytes per rule and 4 bytes per label.
Limit label length to 8 bits. It's max value is already limited to 255.
Limit label id to 16 bits. While policy with more than 2^16 labels is
theoretically possible, it would be handled very badly by kernel.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jan Cybulski [Tue, 28 Jan 2014 12:50:02 +0000 (13:50 +0100)]
libsmack: add possibility of resizing table of labels
Signed-off-by: Jan Cybulski <j.cybulski@samsung.com>
Jan Cybulski [Tue, 28 Jan 2014 11:32:32 +0000 (12:32 +0100)]
libsmack: implement internal hash table of labels
Use hash table implemented internally for dictionary of labels.
Thanks to that some operations are more efficient:
-it is possible to use better hashing function than in hsearch:
DJB2 algorithm is used, which is much better, than hashing function
used in hsearch. Hashing function in hsearch causes, that on 32bit
machines, all labels that have common first eight bytes,
share same bucket and this cause many conflicts in combination of labels
naming convention with domain-based prefixes. This leads to significant
performance degradation in real system. This was not detected on tests
so far, because labels for test policies were generated randomly.
-it is possible to calculate hash during label validation.
-it would not cause drastic complexity growth to have number of labels
near to number of allocated buckets as it happens in hsearch.
-it would be possible to add number of labels exceeding number of
allocated buckets.
Signed-off-by: Jan Cybulski <j.cybulski@samsung.com>
Rafal Krypa [Thu, 13 Feb 2014 13:07:00 +0000 (14:07 +0100)]
libsmack: refactoring of label dictionary code
Commit cd2ce11 introduced label dictionary, with hash table of labels
hidden behind an abstraction layer. This patch drops this layer and merges
the hash table with smack_accesses.
It will enable better handling of data, like storing and accessing
per-label data outside of dict_* functions.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Thu, 13 Feb 2014 16:13:43 +0000 (17:13 +0100)]
libsmack: make local function accesses_add() static
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jarkko Sakkinen [Mon, 3 Feb 2014 07:56:53 +0000 (09:56 +0200)]
Removed redundant AUTHORS files.
Git log is the AUTHORS file.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Tue, 28 Jan 2014 07:39:03 +0000 (09:39 +0200)]
libsmack: lazy initialization for SmackFS mount point
Mount SmackFS only when it is first needed. This enables init
daemons to directly use libsmack.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Tue, 28 Jan 2014 06:30:39 +0000 (08:30 +0200)]
libsmack: close smackfs_mnt_dirfd in the library destructor
Close smackfs_mnt_dirfd in the library destructor. Although kernel
would wipe it anyway it is a good practice to clean up all the
reserved resources.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Thu, 23 Jan 2014 12:54:39 +0000 (14:54 +0200)]
Merge remote-tracking branch 'jsakkine/issue83' into v1.0.x
Conflicts:
libsmack/libsmack.c
Jarkko Sakkinen [Mon, 13 Jan 2014 08:13:30 +0000 (10:13 +0200)]
libsmack: fallback to 'cipso' when 'cipso2' is not available
This patch implements fallback to 'cipso' when 'cipso2' is not
available. This is a regression from 79f8e26.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Mon, 13 Jan 2014 07:57:05 +0000 (09:57 +0200)]
libsmack: add a common function for opening long and short label file
Added internal function 'open_smackfs_file()' to open long label
file and as a fallback short label file. This can be used for
load, access and cipso files.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Mon, 13 Jan 2014 07:45:42 +0000 (09:45 +0200)]
libsmack: fix: fail if neither 'load' and 'load2' cannot be opened
accesses_apply() continued even if neither 'load' and 'load2' could
not be opened. For 'change-rule' file such semantics do make sense
for backwards compatibility but there's something seriously wrong
if neither 'load' and 'load2' cannot be opened. That's why the only
right thing to do is to stop immediately.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Mon, 13 Jan 2014 07:39:48 +0000 (09:39 +0200)]
libsmack: fix: 'accesses_print' declaration was in wrong place
Moved 'accesses_print' declaration to a proper location.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Fri, 10 Jan 2014 18:05:49 +0000 (20:05 +0200)]
utils: fix error message in smackaccess
perror() reports success when validation fails. This patch makes
the error message explicit. Invalid input is the most probable case.
Also, error message is prefixed with the basename of the utility.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Fri, 10 Jan 2014 18:05:13 +0000 (20:05 +0200)]
libsmack: fixed label validation in smack_have_access()
This patch adds subject and object validation to smack_have_access().
It also validates that labels are at most 23 characters when only
short labels are available.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Rafal Krypa [Tue, 7 Jan 2014 15:25:32 +0000 (16:25 +0100)]
libsmack: use 16 bits for smack access codes instead of sizeof(int) * 2
There are 6 access bits to be stored in the access field. Special value -1
is used to distinguish set rules from change rules. Shrinking the filed to
8 bits still leaves space for one more future access bit.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Tue, 7 Jan 2014 15:21:32 +0000 (16:21 +0100)]
libsmack: change logic for detecting long labels in smack_accesses
Instead of storing label length in each smack_rule, have one integer in
smack_accesses to remember if long labels are used.
This saves few bytes per rule.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jarkko Sakkinen [Tue, 7 Jan 2014 07:10:54 +0000 (09:10 +0200)]
Merge remote-tracking branch 'rafal-krypa/issue73' into v1.0.x
Rafal Krypa [Sun, 5 Jan 2014 23:13:47 +0000 (00:13 +0100)]
Update .gitignore files to ignore all build-time generated files
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Thu, 2 Jan 2014 12:52:17 +0000 (13:52 +0100)]
libsmack: use common code for smack_accesses_apply() and smack_accesses_save().
Centralizing code that changes internal smack_accesses representation to
text. Internal function accesses_print() now generates output for applying
the rules to kernel and saving them to a file. This allows easier changes
to data structures used by libmskack and makes the code shorter.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Tue, 31 Dec 2013 20:14:24 +0000 (21:14 +0100)]
libsmack: use common code for smack_accesses_add() and smack_accessess_add_modify()
These API functions were very similar and are now implemented as wrappers
to a single internal function. This allows easier changes to data structures
used by libmskack and makes the code shorter.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Tue, 31 Dec 2013 20:11:35 +0000 (21:11 +0100)]
utils: use common code for apply_rules and apply_cipso
Code for apply_rules() has been rewritten to use opendir() and readdir(),
but apply_cipso() remained implemented with nftw().
This patch implements both applying functions with opendir() and readdir()
using a common internal function apply_path(). The common function can
handle both directory and single file, so apply_rules_file() and
apply_cipso_file() are dropped.
The resulting code is 69 lines shorter and keeps directory traversal logic
in single place. It's side effect is applying CIPSO rules in one shot, just
like regular Smack rules.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Tue, 31 Dec 2013 17:04:56 +0000 (18:04 +0100)]
libsmack: don't define __GNU_SOURCE in the code
__GNU_SOURCE is a glibc internal and should not be used directly.
It was already provided by AC_USE_SYSTEM_EXTENSIONS in configure.ac, so
it can be safely dropped.
Use more explicit AC_GNU_SOURCE in configure.ac instead (on Linux systems
they should be equivalent).
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Tue, 31 Dec 2013 15:08:43 +0000 (16:08 +0100)]
utils: fix build warnings related to smack_smackfs_path()
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Tue, 31 Dec 2013 15:07:55 +0000 (16:07 +0100)]
Compile for the C99 standard.
The code already uses C99 constructs, but appropriate compiler options
were not set.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Tue, 31 Dec 2013 15:03:17 +0000 (16:03 +0100)]
autogen.sh: fix passing arguments to configure
Fixing error when arguments to autogen.sh contain white space, i.e.:
./autogen.sh CFLAGS='-Wall -Wextra'
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jarkko Sakkinen [Fri, 20 Dec 2013 08:02:38 +0000 (10:02 +0200)]
Merge remote-tracking branch 'rafal-krypa/issue84' into v1.0.x
Rafal Krypa [Wed, 18 Dec 2013 23:01:38 +0000 (00:01 +0100)]
utils: drop build dependency on libattr, introduced by 5da1a22.
Use only glibc headers for xattr functions. Use ENODATA instead of ENOATTR.
Jarkko Sakkinen [Wed, 18 Dec 2013 20:02:06 +0000 (22:02 +0200)]
libsmack: fix label validation in smack_new_label_from_path
Off-by-one length was returned from the function. This patch fixes
the regression by doing full validation for the SMACK label.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Rafal Krypa [Tue, 3 Dec 2013 14:58:57 +0000 (15:58 +0100)]
Avoid memory allocation while opening smackfs files.
Using openat() on pre-opened smackfs directory eliminates need to
construct absolute path to a smackfs file before opening it.
Other than it improves availability because file descriptor is kept
open to the mount point throughout the life-cycle of the process.
And it also improves security because as long as the file descriptor
is valid, files really come from SmackFS.
[jsakkine: updated commit message]
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jan Cybulski [Tue, 3 Dec 2013 08:43:41 +0000 (09:43 +0100)]
Add dictionary for labels
Add dictionary for labels to avoid memory allocation
for the same label for multilple times.
Dictionary is common to all labels in a single rules set.
Each rule only keeps ids of labels in a dictionary
instead of whole label as a string.
Signed-off-by: Jan Cybulski <j.cybulski@samsung.com>
José Bollo [Tue, 17 Dec 2013 12:25:47 +0000 (13:25 +0100)]
libsmack: fix a bug in validation of labels
The function `get_label` didn't handle the characters below
' ' and above '~' correctly.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 17 Dec 2013 10:49:44 +0000 (11:49 +0100)]
chsmack: update of the manual
This new version of the manual includes the options
the dereferencing symbolic links and for removing
smack's labels.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 14:33:13 +0000 (15:33 +0100)]
chsmack: refusing repeated labels
Refusing to set many time a label is important for
security. If a label is set more than one time, wich
label is to use? Wich is the good?
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 14:29:14 +0000 (15:29 +0100)]
chsmack: add option to remove labels
Adding that option allow chsmack to remove the smack labels.
It is really important to have it.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 14:22:15 +0000 (15:22 +0100)]
chsmack: split option scan in two parts
It prepares the futur option to remove smack labels.
It also separate the validation of the labels what can
improve the readability of the code.
Also add a check that the option transmute isn't repeated.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 14:11:41 +0000 (15:11 +0100)]
chsmack: using flags for labels
That modification prepare the addition of the option
to remove Smack labels. It seems also best to be agnostic
on what are valid smack labels (and rely on libsmack in the
futur) that maybe one day could be empty strings!
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 14:01:58 +0000 (15:01 +0100)]
chsmack: checking transmute on directories
The transmute flag is meaningfull only on directories.
The program now check that the transmute flag is set
only on directories.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 13:47:27 +0000 (14:47 +0100)]
chsmack: add dereference option
Add the options that allow to follow the symbolic
links instead of modifying it. There is no really
need but it may help.
The text of the short option is moved.
It prepares to scan options in two passes. It also
centralize the definition of options, avoiding to have
many lines between the definitions.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 13:46:18 +0000 (14:46 +0100)]
chsmack: exchanging order of nested blocks if/for
Prepare to add the removing of labels and also reduce
the count of tests.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 13:43:32 +0000 (14:43 +0100)]
chsmack: use of 'smack_set_label_for_path'
To prepare to the future libsmack that will have a function
for writing Smack labels and to prepare to the handling of
symbolic links, the write of the labels is put in the
function 'smack_set_label_for_path'.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 13:37:31 +0000 (14:37 +0100)]
chsmack: use of 'smack_new_label_from_path'
The library libsmack offer a function for reading
Smack labels. It is better to use the function of the
library.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 13:26:40 +0000 (14:26 +0100)]
chsmack: validation of labels
To prepare to the future of libsmack (that will include the
validation function 'smack_label_length'), the validation
of the smack labels is separated from the main function.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 13:13:23 +0000 (14:13 +0100)]
chsmack: put usage string at head
Setting it at head is a reading improvement for
developpers that can quickly show the usage of the
program. It also makes the main function more readable.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Tue, 10 Dec 2013 13:10:23 +0000 (14:10 +0100)]
chsmack: using linux constants for Smack's names
It is better to rely on the centralisation of names in a
single file: it can avoid errors.
The declarations of <linux/xattr.h> contains the definitions
of the names of the Smack's security attributes.
As Smack only runs on Linux and libsmack doesn't provides
a centralized version of the names of the security attributes
(because it were not needed), using the linux header seems
to be a good choice.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
Jarkko Sakkinen [Tue, 10 Dec 2013 11:19:02 +0000 (13:19 +0200)]
tests: starting point for stress testing
This starting point for stress testing. Generates 200 files each
with 10000 random access rules. Does not yet support modify rules.
Next step would be probably making this more parametrized.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
José Bollo [Tue, 10 Dec 2013 09:23:37 +0000 (10:23 +0100)]
Fix return value of 'smack_new_label_from_path'
Change-Id: Ic5412e9555a64a81bf1a871b30844d73dbed5758
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
Jarkko Sakkinen [Mon, 9 Dec 2013 13:05:27 +0000 (15:05 +0200)]
Revert "utils: use common code for apply_rules and apply_cipso"
This reverts commit
68e38ff3936597a3189d29f57a68dae5ac08db1e.
Jarkko Sakkinen [Thu, 5 Dec 2013 18:48:19 +0000 (20:48 +0200)]
Bumped version to 1.0.3.
Rafal Krypa [Wed, 4 Dec 2013 15:58:53 +0000 (16:58 +0100)]
utils: use common code for apply_rules and apply_cipso
Code for apply_rules() has been rewritten to use opendir() and readdir(),
but apply_cipso() remained implemented with nftw().
This patch implements both applying functions with opendir() and readdir()
using a common internal function apply_dir().
The resulting code is 45 lines shorter and keeps directory traversal logic
in single place.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jarkko Sakkinen [Thu, 5 Dec 2013 18:18:02 +0000 (20:18 +0200)]
libsmack: clean up redundant stuff
Cleaned up redundant constants and code. Grouped related constants
nearby each other.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Rafal Krypa [Mon, 22 Jul 2013 17:05:09 +0000 (19:05 +0200)]
libsmack: add support for new access mode for setting locks ("l")
This change should be backward compatible for kernels without l-mode support
as long as requested permissions don't contain this mode.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jarkko Sakkinen [Thu, 5 Dec 2013 17:26:01 +0000 (19:26 +0200)]
utils: common.c: invalid fprintf()
fprintf() has path parameter that was not utilized.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Thu, 28 Nov 2013 23:09:22 +0000 (01:09 +0200)]
utils: apply access rules to load/load2 in one shot
Open load/load2 only once. Inside the callback only collect rules
using smack_accessed_add_from_file(). Finally, apply access rules
in a single slot.
This was inspired by feedback from Rafal Krypa <r.krypa@samsung.com>.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Tue, 3 Dec 2013 16:22:55 +0000 (18:22 +0200)]
Do not silently ignore files when applying them in smackload/ctl
Detect unknown file types and non-regular files and fail if they
are found with proper error reporting.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Mon, 2 Dec 2013 17:34:51 +0000 (19:34 +0200)]
Merge remote-tracking branch 'jsakkine/issue60' into v1.0.x
Jarkko Sakkinen [Mon, 2 Dec 2013 16:22:49 +0000 (18:22 +0200)]
Merge remote-tracking branch 'rafal-krypa/issue70' into v1.0.x
Rafal Krypa [Mon, 2 Dec 2013 14:04:37 +0000 (15:04 +0100)]
smackctl: fix reporting "unknown action" (regression in ce452ab)
Running "smackctl apply" and "smackctl clear" ended with error and
message about unknown action, although the action was known and
performed successfully.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Mon, 2 Dec 2013 15:03:28 +0000 (16:03 +0100)]
libsmack: fix smack_cipso_apply() failing with more than one rule
Fixing regression in
f47b9c90 that causes smack_cipso_apply() to fail due
to a typo.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jarkko Sakkinen [Sun, 1 Dec 2013 15:03:55 +0000 (17:03 +0200)]
libsmack: remove redundant check for clear flag form accesses_apply()
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Sun, 1 Dec 2013 15:01:42 +0000 (17:01 +0200)]
libsmack: remove redundant strlen() call from accesses_apply()
Return value of snprintf() should give the same length as strlen()
would given that string fits into buffer.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Sun, 1 Dec 2013 14:51:04 +0000 (16:51 +0200)]
libsmack: check in accesses_apply() that rule has short labels
Check rule has short labels when only 'load' is available.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Mon, 2 Dec 2013 06:33:00 +0000 (08:33 +0200)]
Merge remote-tracking branch 'rafal-krypa/issue68' into v1.0.x
Jarkko Sakkinen [Sun, 1 Dec 2013 14:43:14 +0000 (16:43 +0200)]
libsmack: early fail in accesses_apply() if modify rules are not supported
In accesses_apply(), in the beginning of each iteration, check
that change_fd is a valid file descriptor if the current rule
is a modify rule. Return with -1 immediately if that is not the
case.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Rafal Krypa [Thu, 3 Jan 2013 09:34:34 +0000 (10:34 +0100)]
libsmack: parse whole access type string, not only first 5 bytes.
Previous version of this function parsed only first ACC_LEN (5)
characters of access_type. Now the whole string will be read.
This will prevent silent ignoring of access type characters in cases
like "-rwxat" or "rrwxat".
Re-applying because it was reverted by
d2283792.
Rafal Krypa [Fri, 29 Nov 2013 19:42:25 +0000 (20:42 +0100)]
libsmack: fixed segfault in get_label() (regression in 66483b)
Commit 66483b introduced segfault in API functions smack_revoke_subject()
and smack_set_label_for_self().
Fix the accidental NULL pointer dereference.
Jarkko Sakkinen [Thu, 28 Nov 2013 16:04:12 +0000 (18:04 +0200)]
Merge remote-tracking branch 'jsakkine/issue64' into v1.0.x
Jarkko Sakkinen [Thu, 28 Nov 2013 15:49:47 +0000 (17:49 +0200)]
libsmack: fixed apply_accesses() (regression in
d2283792)
Took accesses_apply() from 8fd0167 and converted it mechanically
as possible to use the changed struct smack_rule. Now smackload
works succesfully for a single file too. Mistake I did in
d2283792 was that I unncessarily cleaned up accesses_apply()
at the same time as changing things. My bad.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Wed, 27 Nov 2013 22:03:06 +0000 (00:03 +0200)]
isgx: fix: clear flag for directory parameter in smackload/smackctl
Clear flag was not properly applied when directory is given
for smackload. This patch fixes the issue. I decided to move
into opendir/readdir approach because nftw() does not support
supplying any kind of state to the callback. The end result
looks also more manageable that we had before.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Rafal Krypa [Thu, 21 Nov 2013 12:42:24 +0000 (13:42 +0100)]
debian: enable parallel build.
Support `dpkg-buildpackage -j' by adding --parallel to dh invocations.
Rafal Krypa [Fri, 3 May 2013 12:04:51 +0000 (14:04 +0200)]
debian: convert for multi-arch packages.
Rafal Krypa [Fri, 22 Nov 2013 09:45:45 +0000 (10:45 +0100)]
debian: add build dependency on doxygen.
Make sure that devel manuals will be generated for libsmack-dev package.
Jarkko Sakkinen [Tue, 26 Nov 2013 19:02:05 +0000 (21:02 +0200)]
libsmack: revert access codes
Revert access codes as internal representation for access types
because they work much better when we have to merge rules.
Other aim of this patch is to clean up internal presentation.
After this change the whole access state can be represented
with only two integers.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Mon, 25 Nov 2013 13:08:20 +0000 (15:08 +0200)]
utils: more verbose error reporting when applying rules
Add more verbose error reporting when applying either access
rules or CIPSO. The key point is to be able to separate whether
error occured during reading or applying phase.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Zofia Abramowska [Fri, 22 Nov 2013 09:38:06 +0000 (10:38 +0100)]
Fix memory leak on smack_cipso
smack_cipso_free() didn't release main pointer, which was
inconsistent with header description and further usage in
apply_cipso_file().
(cherry picked from commit
6304f9a3f73312a7feb3b25fa593919744acb947)
Jarkko Sakkinen [Thu, 21 Nov 2013 18:50:37 +0000 (20:50 +0200)]
utils: fix CIPSO error messages in common.c
When applying CIPSO fails use different error message than when
applying access rules. Additionally, fixed indentation for lines
printing error message that are over 80 characters long.
(cherry picked from commit
43b5e8da94acba1f790eb65b4256ba6013397dde)
Jarkko Sakkinen [Thu, 21 Nov 2013 15:36:35 +0000 (17:36 +0200)]
doc: show version
Fix documentation to show correct package version.
(cherry picked from commit
399e3a662c0ddb81cae94804a96416ae856e7507)
Rafal Krypa [Thu, 21 Nov 2013 12:40:08 +0000 (13:40 +0100)]
doc: fix parallel build, broken by c5e2007.
Parallel make failed, because dependencies were not properly specified
for all auto generated man pages.
(cherry picked from commit
d9e0abc8657dc1ee5aab391af4543a7cd1c9d757)
Rafal Krypa [Thu, 21 Nov 2013 11:47:26 +0000 (12:47 +0100)]
debian: fix package build, broken by c5e2007.
Auto generated manpages are in different locations than static ones, so
libsmack-dev.manpages needs to be modified.
It now includes all generated section 3 manuals.
(cherry picked from commit
b3b70c21b75cc5e92d7334406557a8f49d0b4714)
Jarkko Sakkinen [Tue, 19 Nov 2013 20:34:02 +0000 (22:34 +0200)]
Generate API documentation by using Doxygen.
Generate API documentation from smack.h by using Doxygen so that
documentation needs to be maintained only in one place.
(cherry picked from commit
c5e200768a99451c559570b0a44673a8ecd5ee7f)
Conflicts:
doc/Makefile.am
doc/smack_have_access.3
Rafal Krypa [Wed, 20 Nov 2013 11:47:26 +0000 (12:47 +0100)]
Solve problem with "make distcheck" breaking on systemd config files.
Dist packages created by "make dist" were built without smack.mount and
smack.service files. This caused the packages to fail to build.
Adding the files to EXTRA_DIST solves the problem.
(cherry picked from commit
73ec7d5be2c87bf13dbd45f2cb8433122b1bd08d)
Jarkko Sakkinen [Tue, 19 Nov 2013 13:07:17 +0000 (15:07 +0200)]
Copy labels using get_label()
Copy and validate labels in a single transaction:
- No trust for having '\0' in the src buffer when copying
labels.
- Improves performance by combining length calculation, validation
and copying.
(cherry picked from commit
16f84d57e2766f1ccfd59ae77fad407b6cc5ff81)
Jarkko Sakkinen [Tue, 19 Nov 2013 11:49:37 +0000 (13:49 +0200)]
Helper function get_label()
The helper function ssize_t get_label(char *dest, const char *src)
validates the given label and copies it to the dest buffer if
available.
(cherry picked from commit
09fdff9a456dec54a4c8548c9b9acbcbce48d59a)
Jarkko Sakkinen [Mon, 18 Nov 2013 16:04:03 +0000 (18:04 +0200)]
Use strncpy() always copying labels.
Defence in depth and a good practice. Places an absolute limit
to the length copied.
(cherry picked from commit
0eee8f8b3efd153c5ef09c08244e189f0cda51a4)
Jarkko Sakkinen [Thu, 14 Nov 2013 15:29:05 +0000 (17:29 +0200)]
Fixed copyright clauses.
Checked that copyright notices are properly set up as according to:
http://www.gnu.org/licenses/gpl-howto.html
Corrected where they are not. Note that one or two-line fixes do not
count as copyrightable assets.
Additionally, fixed a minor indentation issue in chsmack.c.
(cherry picked from commit
7b41f3cff96755146539f74a8c780ac9bbe71b36)
Rafał Krypa [Thu, 14 Nov 2013 23:58:22 +0000 (00:58 +0100)]
Regression fix: don't modify smack_accesses while applying the rules.
Regression introduced in
eaf908fd caused access_type field to be modified,
when smack_accesses_apply() is called with clear set to true.
This patch reverts that, restoring invariant that smack_accessess_apply()
doesn't modify given rule set.
(cherry picked from commit
74f5b5c21a2ed9c0576c3c3ab3802d11d66098a9)
Jarkko Sakkinen [Wed, 30 Oct 2013 13:52:19 +0000 (15:52 +0200)]
Fix man pages
Regression from 1edba54.
(cherry picked from commit
e6f32e4403ad549102cfbdbd02b4dcd254da84d2)
Janusz Kozerski [Mon, 28 Oct 2013 13:28:59 +0000 (14:28 +0100)]
Use smack_label_length() internally instead strnlen()
Use smack_label_length() to check correctness labels instead strnlen().
(cherry picked from commit
6d3fd3049e08377f75b554cedcd200286fbf359c)
Janusz Kozerski [Mon, 28 Oct 2013 13:44:05 +0000 (14:44 +0100)]
Fix value returned by smack_label_length()
In some cases smack_label_length have returned 0 on incorrect label.
Now smack_label_length() always returns -1 in case of incorrect label.
(cherry picked from commit
f7e4232a319b269f6214af660173eebaa605ad9e)
Jarkko Sakkinen [Fri, 25 Oct 2013 13:06:28 +0000 (16:06 +0300)]
Remove errno assignments
If we want to report something libsmack specific, then we should
have our own error codes. By using errno values to report libsmack
specific error condition we almost zero their value. By removing
these assignment you can resolved from a changed errno value that
a system call failed.
This patch does not break API contract as use of errno values is
undefined in the API documentation.
(cherry picked from commit
1edba541de63b088a60d89e4a0433bf9149c4b13)
Jarkko Sakkinen [Fri, 25 Oct 2013 12:46:56 +0000 (15:46 +0300)]
Removed smack_label_length() API
In order to use this smack_label_length() in 1.0 branch, this patch
takes it away from the API. Adds temporarily unused attribute to the
function siganture.
Janusz Kozerski [Wed, 2 Oct 2013 07:52:23 +0000 (09:52 +0200)]
Add smack_label_length() function
Kernel does not validate the Smack label - instead the label will be
cut on the first incorrect character (after parsing at least one
correct character).
This function gives the user possibility to verify the correctness
of the Smack label before use and calculate labels length.
Additionally, all string length calculations are replaces with this
function to make implementation safer.
[jarkko.sakkinen@linux.intel.com:
did some modifications:
- smack_is_label_valid() -> smack_label_length()
- libsmack.c:
* return length
* loop invariant had off-by-one error
* cosmetic: "++i" not "i++"
- libsmack.h:
* updated documentation
* cosmetic: formatting errors in @param and @return]
(cherry picked from commit
8b083a8c67219c5d1dbfbf2ad1082c1954f9c9fa)
Zofia Abramowska [Tue, 6 Aug 2013 13:42:33 +0000 (15:42 +0200)]
Cleaning error logs for rules applying utilities
Removed perror logs from main utilities files. Moved error logs
inside /utils/common.c. Errors are logged from I/O operations and
applying rules/cipso from files.
(cherry picked from commit
bcaf9018f41809cb93aaccf9e9fb49b59750dc7e)
Jarkko Sakkinen [Tue, 22 Oct 2013 19:26:26 +0000 (22:26 +0300)]
Add parameter name back to the chsmack error message
This patch add parameter name back to the error message. Instead
of relaying on hazardous longindex parameter of getopt_long(), a
look-up table is constructed to map short option to the corresponding
struct option entry.
Additionally, the basename of the application is added to the error
message. Also usage message is converted to use basename instead of
the full path name.
(cherry picked from commit
d98a04ff7ccbcfcf36d9d4d43de68448b70da9fa)
José Bollo [Mon, 21 Oct 2013 10:18:50 +0000 (12:18 +0200)]
utils/chsmack: fix hazardous option parsing
The variable option_index was only set to a proper value if the
given option is a long option. There was also exit() missing on
error condition if SMACK label was invalid.
This patch removes option_index, parameter name from corresponding
error message and adds exit() call when the error condition
realizes.
[jarkko.sakkinen@linux.intel.com: rewrote patch description]
(cherry picked from commit
18ebc2fe71da94599e45029d7b26144c6bbe7cb4)
Jarkko Sakkinen [Mon, 21 Oct 2013 16:21:42 +0000 (19:21 +0300)]
Fix: accept 255 character labels
Example:
# /home/jsakkine/devel/smack/utils/chsmack \
-a$(printf '12345%.0s' {1..51}) foo
foo: Invalid argument
# /home/jsakkine/devel/smack/utils/chsmack \
-a$(printf '12345%.0s' {1..51} | head -c -1) foo
#
This patch fixes this issue.
(cherry picked from commit
1794fed08418b0e254e1e3a7325a8a67f8186bbc)
Zofia Abramowska [Tue, 8 Oct 2013 14:24:24 +0000 (16:24 +0200)]
Change apply_cipso_cb() to use proper apply_cipso_file()
apply_cipso_cb() used improper apply_rules_file(). Changed this to
call apply_cipso_file() instead.
(cherry picked from commit
d45ffe9082243377cdba9a2d224bab0e110501e0)
Jarkko Sakkinen [Tue, 8 Oct 2013 13:17:23 +0000 (16:17 +0300)]
Fix: allow CIPSO labels with zero categories
There was false restriction in smack_cipso_add_from_file() that
disallowed CIPSO labels without categories.
For example, this example given in the SMACK kernel documentation
should be perfectly legal:
TopSecret 7
(cherry picked from commit
4e4ea9142727ca7f14bf1d64cd81949b28bb1d0b)
Jarkko Sakkinen [Wed, 2 Oct 2013 08:07:59 +0000 (11:07 +0300)]
Documented order in which access rules are applied to kernel.
(cherry picked from commit
f82cadf3b7a9d84ae0bf2aa06fb8ecff9b4332dc)