Kidong Kim [Mon, 28 Dec 2015 08:09:47 +0000 (17:09 +0900)]
add license file(GPL-2.0)
Change-Id: I6cf8e4a56a08ce7a84a86d1fe3530b6b4df9f499
(cherry picked from commit
8f5c0d11107b071cd72bbe2f3bc8db05a15a37d7)
Rafal Krypa [Mon, 16 Feb 2015 16:20:00 +0000 (17:20 +0100)]
packaging: update version information
Version 1.1.0 has been released and merged.
Change-Id: Ib5d1a24554ac4aeecffe4e632e3af18d1c86c1b4
Rafal Krypa [Mon, 16 Feb 2015 16:32:18 +0000 (17:32 +0100)]
Merge tag 'v1.1.0' into tizen
Conflicts:
configure.ac
debian/libsmack1.symbols
libsmack/Makefile.am
libsmack/libsmack.c
libsmack/sys/smack.h
Change-Id: Ic77fc70eeac91d8113a646a517f56cb59ffb4235
Rafal Krypa [Mon, 16 Feb 2015 16:01:27 +0000 (17:01 +0100)]
Bumped version to 1.1.0
Rafal Krypa [Mon, 16 Feb 2015 16:06:45 +0000 (17:06 +0100)]
build: Ignore and clean up generated file doc/doxygen_sqlite3.db
Rafal Krypa [Mon, 16 Feb 2015 15:53:52 +0000 (16:53 +0100)]
Update maintainer and copyright information
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafał Krypa [Mon, 16 Feb 2015 15:45:57 +0000 (16:45 +0100)]
Merge pull request #114 from jobol/goto-1.1
Going to a delivery of version 1.1
Rafal Krypa [Fri, 9 Jan 2015 10:47:13 +0000 (11:47 +0100)]
packaging: update version information
Version 1.0.5 has been released and merged.
Change-Id: I2a2be59f16583d092ef56e2eb070fcc691c38ab5
Rafal Krypa [Fri, 9 Jan 2015 10:41:44 +0000 (11:41 +0100)]
Merge remote-tracking branch 'tizen/upstream' into tizen
Change-Id: Ib8d978e8e9f223c8b76b52e6e0e04ce0949cf5a2
Rafal Krypa [Fri, 9 Jan 2015 10:38:45 +0000 (11:38 +0100)]
Changed library version to 1.0.5
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Tue, 30 Dec 2014 17:27:12 +0000 (09:27 -0800)]
Revert "libsmack: fix parsing of CIPSO settings"
Replacing it with the final version that got into upstream repo.
This reverts commit
cd52b27e4a3d7c19466b597b341128e7f05c8796.
Change-Id: I15dc6a88a3721af2798ef85b837cdc51a0a1e94a
Rafal Krypa [Fri, 26 Dec 2014 12:53:43 +0000 (12:53 +0000)]
libsmack: use bit array to reduce the size of struct cipso_mapping
To decrease size of struct cipso_mapping, categories are now stored in a
bit array. This reduces the size of the whole struct.
On a i386 machine it will occupy 292 bytes instead of 1004.
Change-Id: I5e9119ee822131cd0adcb479359a0693f094aee6
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Fri, 26 Dec 2014 12:33:54 +0000 (12:33 +0000)]
libsmack: fix parsing of CIPSO settings
Adjust CIPSO parsing to expected kernel format:
- maximum number of categories is 184
- each category value must be between 1 and 184
Change-Id: Ic5e4ccd2104ed3284a873087339bf792536b2125
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jan Cybulski [Mon, 22 Dec 2014 10:07:58 +0000 (11:07 +0100)]
smackcipso: usage update
Signed-off-by: Jan Cybulski <j.cybulski@samsung.com>
Rafał Krypa [Sun, 28 Dec 2014 10:56:42 +0000 (10:56 +0000)]
Merge pull request #117 from JanCybulski/master
smackcipso: usage update
Rafał Krypa [Sun, 28 Dec 2014 10:56:06 +0000 (10:56 +0000)]
Merge pull request #116 from rafal-krypa/issue116
libsmack: fix parsing of CIPSO settings
Rafal Krypa [Fri, 26 Dec 2014 12:53:43 +0000 (12:53 +0000)]
libsmack: use bit array to reduce the size of struct cipso_mapping
To decrease size of struct cipso_mapping, categories are now stored in a
bit array. This reduces the size of the whole struct.
On a i386 machine it will occupy 292 bytes instead of 1004.
Change-Id: I5e9119ee822131cd0adcb479359a0693f094aee6
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Fri, 26 Dec 2014 12:33:54 +0000 (12:33 +0000)]
libsmack: fix parsing of CIPSO settings
Adjust CIPSO parsing to expected kernel format:
- maximum number of categories is 184
- each category value must be between 1 and 184
Change-Id: Ic5e4ccd2104ed3284a873087339bf792536b2125
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jan Cybulski [Mon, 22 Dec 2014 10:07:58 +0000 (11:07 +0100)]
smackcipso: usage update
Signed-off-by: Jan Cybulski <j.cybulski@samsung.com>
Rafal Krypa [Sat, 20 Dec 2014 01:31:05 +0000 (01:31 +0000)]
libsmack: fix parsing of CIPSO settings
Adjust CIPSO parsing to expected kernel format:
- maximum number of categories is 184
- each category value must be between 1 and 184
To decrease size of struct cipso_mapping, categories are now stored in a
bit array. Thanks to this, category bitmap occupies 96 bits instead of 736.
Change-Id: I38b8fa5bd0830abc59de9dc3ebf208e18a82bbeb
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
José Bollo [Tue, 15 Apr 2014 07:12:45 +0000 (09:12 +0200)]
smackctl: Adding reliable usage
Adding help text providing usage information for smackctl utility.
Minor improvement of the manual page for smackctl.
Change-Id: I31f8fd4a4c866284255e4865bf7bb9512e3c793f
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Thu, 9 Oct 2014 07:04:41 +0000 (09:04 +0200)]
libsmack: New functions handling file's attributes
The new functions are:
- smack_new_label_from_file
- smack_set_label_for_file
- smack_remove_label_for_file
This functions allow to operate on opened
files using their linux file descritor for
reading, writing or destroying the named
file attribute given.
Change-Id: I454e96ca2eeb21e08a40c39c830e5b903875580b
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
Krzysztof Jackiewicz [Thu, 28 Aug 2014 15:39:01 +0000 (17:39 +0200)]
Fixed memory leak CID: 40641
Change-Id: I0c768b65964bdf2f7578ee937b7807054336e41c
Jarkko Sakkinen [Thu, 5 Jun 2014 16:24:46 +0000 (19:24 +0300)]
Merge branch 'v1.0.x'
Jarkko Sakkinen [Thu, 5 Jun 2014 16:24:17 +0000 (19:24 +0300)]
Merge remote-tracking branch 'penszo/v1.0.x' into v1.0.x
Jarkko Sakkinen [Thu, 5 Jun 2014 16:22:23 +0000 (19:22 +0300)]
Revert "libsmack: Terminate attribute string"
This reverts commit
cbdd52af82bce9d2ab79e43e0757c4d077d08907.
Rafal Krypa [Tue, 15 Apr 2014 15:24:19 +0000 (17:24 +0200)]
libsmack: fix smack_new_label_from_path() (regression in
e6890752)
Function smack_new_label_from_path failed to null-terminate xattr value
before passing it to get_label.
Change-Id: I7338c97eb6ec2925c7b5a9d30b4f428002bcb3b6
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Zbigniew Jasinski [Thu, 29 May 2014 09:57:12 +0000 (11:57 +0200)]
libsmack: fix memory leak
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>
Casey Schaufler [Fri, 9 May 2014 14:55:08 +0000 (07:55 -0700)]
Merge "Clean spec file and remove depreacated /smack install directory." into tizen
Adrian Negreanu [Thu, 21 Nov 2013 18:52:37 +0000 (20:52 +0200)]
require pkg-config at build time
[ 296s] ./configure: line 10783: syntax error near unexpected token `SYSTEMD,'
[ 296s] ./configure: line 10783: `PKG_CHECK_MODULES(SYSTEMD,'
[ 297s] error: Bad exit status from /var/tmp/rpm-tmp.u3al6b (%build)
Change-Id: I6e565f370f7330366be0d7d7fa57edb74dc8635e
Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com>
Casey Schaufler [Fri, 2 May 2014 23:34:24 +0000 (16:34 -0700)]
libsmack: Terminate attribute string
The smack_new_label_from_path function reads an xattr
that may not be null byte terminated. This occurs in the
SMACK64TRANSMUTE case. Technically, the transmute attribute
isn't a label, so this function shouldn't be used to fetch
the value, but we'll let that go. This is just good string
hygiene in any case.
This is an issue because chsmack prints transmute="TRUE0"
without this fix.
Signed-off-by: Casey Schaufler <casey.schaufler@intel.com>
Jarkko Sakkinen [Thu, 24 Apr 2014 05:08:37 +0000 (08:08 +0300)]
Merge branch 'v1.0.x'
Conflicts:
utils/smackctl.c
Jarkko Sakkinen [Thu, 24 Apr 2014 04:22:29 +0000 (07:22 +0300)]
Merge remote-tracking branch 'rafal-krypa/issue108' into v1.0.x
Jarkko Sakkinen [Mon, 14 Apr 2014 22:37:21 +0000 (01:37 +0300)]
utils: add options for version and usage information
Added option -v/--version for displaying version information
and -h/--help for displaying usage information.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Ronan Le Martret [Fri, 21 Mar 2014 16:28:18 +0000 (17:28 +0100)]
Clean spec file and remove depreacated /smack install directory.
Change-Id: If6234f54899df5b88091959062a324df66fc8551
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
Rafal Krypa [Tue, 15 Apr 2014 15:24:19 +0000 (17:24 +0200)]
libsmack: fix smack_new_label_from_path() (regression in
e6890752)
Function smack_new_label_from_path failed to null-terminate xattr value
before passing it to get_label.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jarkko Sakkinen [Mon, 14 Apr 2014 22:24:00 +0000 (01:24 +0300)]
Merge branch 'v1.0.x'
Jarkko Sakkinen [Mon, 14 Apr 2014 22:09:00 +0000 (01:09 +0300)]
utils/smackaccess: added missing include libgen.h
libgen.h must be included for basename()
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Mon, 14 Apr 2014 21:22:21 +0000 (00:22 +0300)]
Merge branch 'v1.0.x'
Jarkko Sakkinen [Mon, 14 Apr 2014 21:20:23 +0000 (00:20 +0300)]
utils/chsmack: added missing include libgen.h
libgen.h must be included for basename()
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Rafal Krypa [Fri, 11 Apr 2014 15:32:46 +0000 (17:32 +0200)]
packaging: update version information
Version 1.0.4 has been merged previously, but spec was left with 1.0.3.1.
Change-Id: I8b722f7d11c285be5748f00fbdc15d1ea74babff
jsakkine [Sun, 30 Mar 2014 16:17:32 +0000 (19:17 +0300)]
Merge pull request #105 from jobol/issue105
libsmack: `verify_smackfs_mnt` wrongly expects smackfs to be writable
José Bollo [Thu, 27 Mar 2014 14:47:02 +0000 (15:47 +0100)]
libsmack: Removes checking smackfs isn't read only
Assuming that smack is available only if the filesystem
smackfs is mounted without being set to read-only have
negative side effects on tools like 'id', 'ls', 'ps'.
In effect, these tools are using libsmack to detect
availability of Smack and to tune their output to
print contexts.
This fixes smack-team/smack#105
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
Rafal Krypa [Mon, 17 Mar 2014 16:09:31 +0000 (17:09 +0100)]
libsmack: fix smack_have_access() (regression in
d7319c71)
Commit
d7319c71 introduced an internal function for opening smackfs files,
when there is a long and short label version. The new function always
opens the file write only, but smack_have access() requires O_RDWR.
The internal function is now extended to take argument with file access
mode.
Change-Id: Ibf3d55cbcbbf746f95660d2f630ef0bfe719026c
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jarkko Sakkinen [Tue, 18 Mar 2014 06:49:28 +0000 (08:49 +0200)]
Merge branch 'v1.0.x'
Rafal Krypa [Mon, 17 Mar 2014 16:09:31 +0000 (17:09 +0100)]
libsmack: fix smack_have_access() (regression in
d7319c71)
Commit
d7319c71 introduced an internal function for opening smackfs files,
when there is a long and short label version. The new function always
opens the file write only, but smack_have access() requires O_RDWR.
The internal function is now extended to take argument with file access
mode.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Thu, 13 Mar 2014 17:40:44 +0000 (18:40 +0100)]
libsmack: add function for policy loading at system startup
New function smack_load_policy() is intended to be used by systemd for
policy loading at system startup. It reuses existing code from
utils/common.c, now moved to libsmack/common.c.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jarkko Sakkinen [Thu, 13 Mar 2014 13:44:42 +0000 (15:44 +0200)]
Merge branch 'upstream' into tizen
Conflicts:
libsmack/libsmack.c
Rafal Krypa [Thu, 20 Feb 2014 14:04:57 +0000 (15:04 +0100)]
libsmack: add functions for setting and removing labels on files
Jóse Bollo implemented two functions as part of this various
improvements for the chsmack command-line utility:
- smack_set_label_for_path() (see f1dfd85)
- smack_remove_label_for_path() (see 5da1a22)
Since they are generally useful, they should be part of the
API in libsmack 1.1.
This patch migrates these functions to libsmack and exports
the symbols. Also, the chsmack is modified to use the new API
instead of the internal functions.
[jsakkine: rewrote the patch description]
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Thu, 20 Feb 2014 11:35:38 +0000 (13:35 +0200)]
Merge branch 'v1.0.x'
Conflicts:
configure.ac
libsmack/Makefile.am
libsmack/libsmack.c
Jarkko Sakkinen [Thu, 20 Feb 2014 11:31:28 +0000 (13:31 +0200)]
Changed library version to 1.0.4
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen [Thu, 20 Feb 2014 11:27:18 +0000 (13:27 +0200)]
Merge remote-tracking branch 'rafal-krypa/issue51' into v1.0.x
Jarkko Sakkinen [Thu, 20 Feb 2014 11:27:06 +0000 (13:27 +0200)]
Merge remote-tracking branch 'jobol/issue94' into v1.0.x
Rafal Krypa [Tue, 18 Feb 2014 11:16:50 +0000 (12:16 +0100)]
libsmack: avoid sprintf() when printing rules in long format
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Fri, 14 Feb 2014 14:22:53 +0000 (15:22 +0100)]
libsmack: enable multi-line support for writing to load2 and change-rule
Since Linux 3.12 Smack can handle multiple rules in single write when
loading policy. Libsmack will detect this support and group rules into
blocks of PAGE_SIZE-1 bytes at most. This results in much smaller number
of syscalls and faster loading of large policy.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Jarkko Sakkinen [Tue, 18 Feb 2014 08:34:05 +0000 (10:34 +0200)]
Merge remote-tracking branch 'jobol/addgen' into v1.0.x
José Bollo [Fri, 14 Feb 2014 10:34:26 +0000 (11:34 +0100)]
tests: Improved version of generator
This version use a generating algorithm to ensure
the generator constraints. It has two new options:
- s=N to shuffle or sort the result
- p=N to set the percentage of modification rules
The Makefile now make optimisation and have warning detection.
The make_policies script now use the shuffle option.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
Jan Cybulski [Thu, 13 Feb 2014 09:41:26 +0000 (10:41 +0100)]
tests: Produce sorted policy with unique rule only
There is no need for tests of sorted policies with non unique rules.
If someone prepares sorted policy, redundancy of rules should also
be removed during sorting.
José Bollo [Thu, 13 Feb 2014 08:31:06 +0000 (09:31 +0100)]
tests: Improved formating of code
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Thu, 13 Feb 2014 08:18:01 +0000 (09:18 +0100)]
tests: Adding a usage function.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Wed, 12 Feb 2014 17:31:20 +0000 (18:31 +0100)]
tests: Adding some comments
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Wed, 12 Feb 2014 17:01:48 +0000 (18:01 +0100)]
tests: Correcting exit codes
The valid exit code are form 0 to 255. Then using -1 means that the
effective exit code will be 0377==255. It isn't accurate. The exit code
of 1 is merely very often used for failure status.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Wed, 12 Feb 2014 15:16:24 +0000 (16:16 +0100)]
tests: Renaming 'r' to 'alea'
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
José Bollo [Wed, 12 Feb 2014 11:42:20 +0000 (12:42 +0100)]
tests: Changing filenames
Changing two filenames:
- tests/gen.c becomes tests/generator.c
- tests/makefile becomes tests/Makefile
That is obviously better to have the main file of the program
`generator` named `generator.c`.
The default naming of makefiles is Makefile with a capital
letter. Conforming to that rule is better.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
Jan Cybulski [Fri, 7 Feb 2014 13:58:52 +0000 (14:58 +0100)]
tests: Change program generating test data
-Change program to produce more parametrized output:
*Introduce parameters to set number of unique rules (u) and merges in policy (m).
*Introduce parametr for maximum number of reocurrances of a label in merged policy (L).
*Add possibility of getting list of labels from stdin in addition to generating random ones.
-Some minor style adjustments to libsmack coding style.
Also:
-Add makefile for policies generation
-Add script generating different type of policies
Signed-off-by: Jan Cybulski <j.cybulski@samsung.com>
Rafal Krypa [Fri, 14 Feb 2014 10:41:07 +0000 (11:41 +0100)]
don't allocate memory in accesses_print
Rafal Krypa [Fri, 14 Feb 2014 09:44:26 +0000 (10:44 +0100)]
change type of label_id back to int
Rafal Krypa [Thu, 13 Feb 2014 16:32:29 +0000 (17:32 +0100)]
libsmack: merge rules with the same subject and object before applying them
All rules with the same subject and object will be merged into a single one
before applying rules to kernel or writing them to a file. The result will
consist of smaller number of rules, but they will have the same semantics.
This enhances performance greatly when there are a lot of rules to merge.
The merging code has negligible overhead when there are no merges to
perform.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Rafal Krypa [Thu, 13 Feb 2014 13:22:19 +0000 (14:22 +0100)]
libsmack: change semantics of rule allow_code and deny_code
Fields in struct smack_rule are used to store either set or modify rule.
Set rules used to be distinguished by having deny_code = -1.
It is more convenient to have it differently: allow_code describing bits
that are to be set, deny_code describing bits that are to be cleared.
With that semantics access_code = ~deny_code for set rules. This enables
easy replacement of change rules that can be simplified to a set rule.
Thanks José Bollo for original idea about simplifying modify rules.
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
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>
José Bollo [Wed, 5 Feb 2014 13:27:53 +0000 (14:27 +0100)]
Adding a program generating test data.
The program that generate this gen.c produces
a set of rules to be loaded to load/load2
file system interace of smacke. Or to be used
as input file for smackload.
The count of differents labels (option l=N) and of
different access rights (option r=N) can be specified.
The count of rules produced to the ouput can also
be specified (option o=N). By default, l=5, r=100 and o=500.
The generated labels are made of 4 to 7 random letters.
The standard C function 'rand' is used without seeding it;
what means that same options produces same results.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
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>
José Bollo [Thu, 23 Jan 2014 10:04:50 +0000 (11:04 +0100)]
Fix bug in cipso written rules
The label (either short or long) was followed by a null character.
It is now followed by a space.
Note that the format for cipso2 smackfs is "%s?%4d%4d..."
where ? stands for any invalid label character.
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
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>
Jarkko Sakkinen [Fri, 10 Jan 2014 17:33:59 +0000 (19:33 +0200)]
Merge branch 'v1.0.x'
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:03:40 +0000 (10:03 +0200)]
Merge branch 'v1.0.x'