* [PATCH] libselinux: Support consistent mode size for bin files
@ 2015-05-27 14:30 Richard Haines
2015-05-27 15:11 ` Stephen Smalley
0 siblings, 1 reply; 2+ messages in thread
From: Richard Haines @ 2015-05-27 14:30 UTC (permalink / raw)
To: selinux
Currently sefcontext_compile defines the mode field as mode_t whose
size will vary depending on the architecture (e.g. 32 bit / 64 bit).
This patch sets the size when writing/reading binary files to
uint32_t. The file version is set to SELINUX_COMPILED_FCONTEXT_MODE
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
---
libselinux/src/label_file.c | 8 +++++++-
libselinux/src/label_file.h | 5 ++++-
libselinux/utils/sefcontext_compile.c | 5 +++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c
index 7da79b4..bfb64af 100644
--- a/libselinux/src/label_file.c
+++ b/libselinux/src/label_file.c
@@ -404,6 +404,7 @@ static int load_mmap(struct selabel_handle *rec, const char *path, struct stat *
for (i = 0; i < regex_array_len; i++) {
struct spec *spec;
int32_t stem_id, meta_chars;
+ uint32_t mode = 0;
rc = grow_specs(data);
if (rc < 0)
@@ -454,10 +455,15 @@ static int load_mmap(struct selabel_handle *rec, const char *path, struct stat *
}
/* Process mode */
- rc = next_entry(&spec->mode, mmap_area, sizeof(mode_t));
+ if (version >= SELINUX_COMPILED_FCONTEXT_MODE)
+ rc = next_entry(&mode, mmap_area, sizeof(uint32_t));
+ else
+ rc = next_entry(&mode, mmap_area, sizeof(mode_t));
if (rc < 0)
goto err;
+ spec->mode = mode;
+
/* map the stem id from the mmap file to the data->stem_arr */
rc = next_entry(&stem_id, mmap_area, sizeof(int32_t));
if (rc < 0)
diff --git a/libselinux/src/label_file.h b/libselinux/src/label_file.h
index 3d963b4..4c2dc9b 100644
--- a/libselinux/src/label_file.h
+++ b/libselinux/src/label_file.h
@@ -6,9 +6,12 @@
#include "label_internal.h"
#define SELINUX_MAGIC_COMPILED_FCONTEXT 0xf97cff8a
+#define SELINUX_COMPILED_FCONTEXT_MAX_VERS SELINUX_COMPILED_FCONTEXT_MODE
+
+/* Version specific changes */
#define SELINUX_COMPILED_FCONTEXT_NOPCRE_VERS 1
#define SELINUX_COMPILED_FCONTEXT_PCRE_VERS 2
-#define SELINUX_COMPILED_FCONTEXT_MAX_VERS 2
+#define SELINUX_COMPILED_FCONTEXT_MODE 3
/* Prior to verison 8.20, libpcre did not have pcre_free_study() */
#if (PCRE_MAJOR < 8 || (PCRE_MAJOR == 8 && PCRE_MINOR < 20))
diff --git a/libselinux/utils/sefcontext_compile.c b/libselinux/utils/sefcontext_compile.c
index e6d93d4..b132706 100644
--- a/libselinux/utils/sefcontext_compile.c
+++ b/libselinux/utils/sefcontext_compile.c
@@ -142,7 +142,8 @@ static int process_file(struct saved_data *data, const char *filename)
* char - char array of the raw context
* u32 - length of the upcoming regex_str
* char - char array of the original regex string including the stem.
- * mode_t - mode bits
+ * u32 - mode bits for >= SELINUX_COMPILED_FCONTEXT_MODE
+ * mode_t for <= SELINUX_COMPILED_FCONTEXT_PCRE_VERS
* s32 - stemid associated with the regex
* u32 - spec has meta characters
* u32 - data length of the pcre regex
@@ -247,7 +248,7 @@ static int write_binary_file(struct saved_data *data, int fd)
goto err;
/* binary F_MODE bits */
- len = fwrite(&mode, sizeof(mode), 1, bin_file);
+ len = fwrite(&mode, sizeof(uint32_t), 1, bin_file);
if (len != 1)
goto err;
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] libselinux: Support consistent mode size for bin files
2015-05-27 14:30 [PATCH] libselinux: Support consistent mode size for bin files Richard Haines
@ 2015-05-27 15:11 ` Stephen Smalley
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Smalley @ 2015-05-27 15:11 UTC (permalink / raw)
To: Richard Haines, selinux
On 05/27/2015 10:30 AM, Richard Haines wrote:
> Currently sefcontext_compile defines the mode field as mode_t whose
> size will vary depending on the architecture (e.g. 32 bit / 64 bit).
> This patch sets the size when writing/reading binary files to
> uint32_t. The file version is set to SELINUX_COMPILED_FCONTEXT_MODE
>
> Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
> ---
> libselinux/src/label_file.c | 8 +++++++-
> libselinux/src/label_file.h | 5 ++++-
> libselinux/utils/sefcontext_compile.c | 5 +++--
> 3 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c
> index 7da79b4..bfb64af 100644
> --- a/libselinux/src/label_file.c
> +++ b/libselinux/src/label_file.c
> @@ -404,6 +404,7 @@ static int load_mmap(struct selabel_handle *rec, const char *path, struct stat *
> for (i = 0; i < regex_array_len; i++) {
> struct spec *spec;
> int32_t stem_id, meta_chars;
> + uint32_t mode = 0;
>
> rc = grow_specs(data);
> if (rc < 0)
> @@ -454,10 +455,15 @@ static int load_mmap(struct selabel_handle *rec, const char *path, struct stat *
> }
>
> /* Process mode */
> - rc = next_entry(&spec->mode, mmap_area, sizeof(mode_t));
> + if (version >= SELINUX_COMPILED_FCONTEXT_MODE)
> + rc = next_entry(&mode, mmap_area, sizeof(uint32_t));
> + else
> + rc = next_entry(&mode, mmap_area, sizeof(mode_t));
> if (rc < 0)
> goto err;
>
> + spec->mode = mode;
> +
> /* map the stem id from the mmap file to the data->stem_arr */
> rc = next_entry(&stem_id, mmap_area, sizeof(int32_t));
> if (rc < 0)
> diff --git a/libselinux/src/label_file.h b/libselinux/src/label_file.h
> index 3d963b4..4c2dc9b 100644
> --- a/libselinux/src/label_file.h
> +++ b/libselinux/src/label_file.h
> @@ -6,9 +6,12 @@
> #include "label_internal.h"
>
> #define SELINUX_MAGIC_COMPILED_FCONTEXT 0xf97cff8a
> +#define SELINUX_COMPILED_FCONTEXT_MAX_VERS SELINUX_COMPILED_FCONTEXT_MODE
I would typically put this after the definition being used. If you want
it to be separated by an empty line after it for readability, that's fine.
> +
> +/* Version specific changes */
> #define SELINUX_COMPILED_FCONTEXT_NOPCRE_VERS 1
> #define SELINUX_COMPILED_FCONTEXT_PCRE_VERS 2
> -#define SELINUX_COMPILED_FCONTEXT_MAX_VERS 2
> +#define SELINUX_COMPILED_FCONTEXT_MODE 3
>
> /* Prior to verison 8.20, libpcre did not have pcre_free_study() */
> #if (PCRE_MAJOR < 8 || (PCRE_MAJOR == 8 && PCRE_MINOR < 20))
> diff --git a/libselinux/utils/sefcontext_compile.c b/libselinux/utils/sefcontext_compile.c
> index e6d93d4..b132706 100644
> --- a/libselinux/utils/sefcontext_compile.c
> +++ b/libselinux/utils/sefcontext_compile.c
> @@ -142,7 +142,8 @@ static int process_file(struct saved_data *data, const char *filename)
> * char - char array of the raw context
> * u32 - length of the upcoming regex_str
> * char - char array of the original regex string including the stem.
> - * mode_t - mode bits
> + * u32 - mode bits for >= SELINUX_COMPILED_FCONTEXT_MODE
> + * mode_t for <= SELINUX_COMPILED_FCONTEXT_PCRE_VERS
> * s32 - stemid associated with the regex
> * u32 - spec has meta characters
> * u32 - data length of the pcre regex
> @@ -247,7 +248,7 @@ static int write_binary_file(struct saved_data *data, int fd)
> goto err;
>
> /* binary F_MODE bits */
> - len = fwrite(&mode, sizeof(mode), 1, bin_file);
> + len = fwrite(&mode, sizeof(uint32_t), 1, bin_file);
Don't you need a uint32_t local variable into which you can copy mode
and then write it here? Otherwise you can read past the end of the
mode_t if it is short?
> if (len != 1)
> goto err;
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-27 15:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-27 14:30 [PATCH] libselinux: Support consistent mode size for bin files Richard Haines
2015-05-27 15:11 ` Stephen Smalley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.