* [PATCH 1/5] libselinux/man: correct file extension of man pages
@ 2024-04-29 16:31 Christian Göttsche
2024-04-29 16:31 ` [PATCH 2/5] libselinux/man: sync const qualifiers Christian Göttsche
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Christian Göttsche @ 2024-04-29 16:31 UTC (permalink / raw
To: selinux; +Cc: Christian Göttsche
From: Christian Göttsche <cgzones@googlemail.com>
Set the correct file extension .3 (instead of .c) for the
security_validatetrans(3) and security_validatetrans_raw(3) man pages.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
.../man3/{security_validatetrans.c => security_validatetrans.3} | 0
...{security_validatetrans_raw.c => security_validatetrans_raw.3} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename libselinux/man/man3/{security_validatetrans.c => security_validatetrans.3} (100%)
rename libselinux/man/man3/{security_validatetrans_raw.c => security_validatetrans_raw.3} (100%)
diff --git a/libselinux/man/man3/security_validatetrans.c b/libselinux/man/man3/security_validatetrans.3
similarity index 100%
rename from libselinux/man/man3/security_validatetrans.c
rename to libselinux/man/man3/security_validatetrans.3
diff --git a/libselinux/man/man3/security_validatetrans_raw.c b/libselinux/man/man3/security_validatetrans_raw.3
similarity index 100%
rename from libselinux/man/man3/security_validatetrans_raw.c
rename to libselinux/man/man3/security_validatetrans_raw.3
--
2.43.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/5] libselinux/man: sync const qualifiers
2024-04-29 16:31 [PATCH 1/5] libselinux/man: correct file extension of man pages Christian Göttsche
@ 2024-04-29 16:31 ` Christian Göttsche
2024-04-29 16:31 ` [PATCH 3/5] libselinux/man: use void in synopses Christian Göttsche
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Christian Göttsche @ 2024-04-29 16:31 UTC (permalink / raw
To: selinux; +Cc: Christian Göttsche
From: Christian Göttsche <cgzones@googlemail.com>
Sync the const qualifiers of parameters with the actual implementation.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
libselinux/man/man3/avc_context_to_sid.3 | 2 +-
libselinux/man/man3/getfscreatecon.3 | 4 ++--
libselinux/man/man3/getkeycreatecon.3 | 4 ++--
libselinux/man/man3/getsockcreatecon.3 | 4 ++--
libselinux/man/man3/init_selinuxmnt.3 | 2 +-
libselinux/man/man3/is_context_customizable.3 | 2 +-
libselinux/man/man3/selinux_raw_context_to_color.3 | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libselinux/man/man3/avc_context_to_sid.3 b/libselinux/man/man3/avc_context_to_sid.3
index 5532d6c5..4586b999 100644
--- a/libselinux/man/man3/avc_context_to_sid.3
+++ b/libselinux/man/man3/avc_context_to_sid.3
@@ -10,7 +10,7 @@ avc_context_to_sid, avc_sid_to_context, avc_get_initial_sid \- obtain and manipu
.br
.B #include <selinux/avc.h>
.sp
-.BI "int avc_context_to_sid(char *" ctx ", security_id_t *" sid ");"
+.BI "int avc_context_to_sid(const char *" ctx ", security_id_t *" sid ");"
.sp
.BI "int avc_sid_to_context(security_id_t " sid ", char **" ctx ");"
.sp
diff --git a/libselinux/man/man3/getfscreatecon.3 b/libselinux/man/man3/getfscreatecon.3
index c6faadc1..47ec30f4 100644
--- a/libselinux/man/man3/getfscreatecon.3
+++ b/libselinux/man/man3/getfscreatecon.3
@@ -9,9 +9,9 @@ getfscreatecon, setfscreatecon \- get or set the SELinux security context used f
.sp
.BI "int getfscreatecon_raw(char **" con );
.sp
-.BI "int setfscreatecon(char *" context );
+.BI "int setfscreatecon(const char *" context );
.sp
-.BI "int setfscreatecon_raw(char *" context );
+.BI "int setfscreatecon_raw(const char *" context );
.
.SH "DESCRIPTION"
.BR getfscreatecon ()
diff --git a/libselinux/man/man3/getkeycreatecon.3 b/libselinux/man/man3/getkeycreatecon.3
index 7887b9b8..0ef27be7 100644
--- a/libselinux/man/man3/getkeycreatecon.3
+++ b/libselinux/man/man3/getkeycreatecon.3
@@ -9,9 +9,9 @@ getkeycreatecon, setkeycreatecon \- get or set the SELinux security context used
.sp
.BI "int getkeycreatecon_raw(char **" con );
.sp
-.BI "int setkeycreatecon(char *" context );
+.BI "int setkeycreatecon(const char *" context );
.sp
-.BI "int setkeycreatecon_raw(char *" context );
+.BI "int setkeycreatecon_raw(const char *" context );
.
.SH "DESCRIPTION"
.BR getkeycreatecon ()
diff --git a/libselinux/man/man3/getsockcreatecon.3 b/libselinux/man/man3/getsockcreatecon.3
index 9223f60f..9795fb65 100644
--- a/libselinux/man/man3/getsockcreatecon.3
+++ b/libselinux/man/man3/getsockcreatecon.3
@@ -9,9 +9,9 @@ getsockcreatecon, setsockcreatecon \- get or set the SELinux security context us
.sp
.BI "int getsockcreatecon_raw(char **" con );
.sp
-.BI "int setsockcreatecon(char *" context );
+.BI "int setsockcreatecon(const char *" context );
.sp
-.BI "int setsockcreatecon_raw(char *" context );
+.BI "int setsockcreatecon_raw(const char *" context );
.
.SH "DESCRIPTION"
.BR getsockcreatecon ()
diff --git a/libselinux/man/man3/init_selinuxmnt.3 b/libselinux/man/man3/init_selinuxmnt.3
index 8466f9ff..6c83698a 100644
--- a/libselinux/man/man3/init_selinuxmnt.3
+++ b/libselinux/man/man3/init_selinuxmnt.3
@@ -7,7 +7,7 @@ init_selinuxmnt \- initialize the global variable selinux_mnt
.sp
.BI "static void fini_selinuxmnt(void);"
.sp
-.BI "void set_selinuxmnt(char *" mnt ");"
+.BI "void set_selinuxmnt(const char *" mnt ");"
.
.SH "DESCRIPTION"
.BR init_selinuxmnt ()
diff --git a/libselinux/man/man3/is_context_customizable.3 b/libselinux/man/man3/is_context_customizable.3
index c858a026..ca332dc4 100644
--- a/libselinux/man/man3/is_context_customizable.3
+++ b/libselinux/man/man3/is_context_customizable.3
@@ -5,7 +5,7 @@ is_context_customizable \- check whether SELinux context type is customizable by
.SH "SYNOPSIS"
.B #include <selinux/selinux.h>
.sp
-.BI "int is_context_customizable(char *" scon );
+.BI "int is_context_customizable(const char *" scon );
.
.SH "DESCRIPTION"
This function checks whether the type of scon is in the
diff --git a/libselinux/man/man3/selinux_raw_context_to_color.3 b/libselinux/man/man3/selinux_raw_context_to_color.3
index cfd564df..fb657f81 100644
--- a/libselinux/man/man3/selinux_raw_context_to_color.3
+++ b/libselinux/man/man3/selinux_raw_context_to_color.3
@@ -5,7 +5,7 @@ selinux_raw_context_to_color \- Return RGB color string for an SELinux security
.SH "SYNOPSIS"
.B #include <selinux/selinux.h>
.sp
-.BI "int selinux_raw_context_to_color(char *" raw ", "
+.BI "int selinux_raw_context_to_color(const char *" raw ", "
.RS
.BI "char **" color_str ");"
.RE
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] libselinux/man: use void in synopses
2024-04-29 16:31 [PATCH 1/5] libselinux/man: correct file extension of man pages Christian Göttsche
2024-04-29 16:31 ` [PATCH 2/5] libselinux/man: sync const qualifiers Christian Göttsche
@ 2024-04-29 16:31 ` Christian Göttsche
2024-04-29 16:31 ` [PATCH 4/5] libselinux/man: add format attribute for set_matchpathcon_printf(3) Christian Göttsche
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Christian Göttsche @ 2024-04-29 16:31 UTC (permalink / raw
To: selinux; +Cc: Christian Göttsche
From: Christian Göttsche <cgzones@googlemail.com>
For functions that do not take any argument use consistently void
instead of empty parenthesis.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
libselinux/man/man3/is_selinux_enabled.3 | 4 ++--
libselinux/man/man3/security_policyvers.3 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libselinux/man/man3/is_selinux_enabled.3 b/libselinux/man/man3/is_selinux_enabled.3
index a887b48c..16b7cd3c 100644
--- a/libselinux/man/man3/is_selinux_enabled.3
+++ b/libselinux/man/man3/is_selinux_enabled.3
@@ -8,9 +8,9 @@ is_selinux_mls_enabled \- check whether SELinux is enabled for (Multi Level Secu
.SH "SYNOPSIS"
.B #include <selinux/selinux.h>
.sp
-.B int is_selinux_enabled();
+.B int is_selinux_enabled(void);
.sp
-.B int is_selinux_mls_enabled();
+.B int is_selinux_mls_enabled(void);
.
.SH "DESCRIPTION"
.BR is_selinux_enabled ()
diff --git a/libselinux/man/man3/security_policyvers.3 b/libselinux/man/man3/security_policyvers.3
index 041ff3a7..b2f6185b 100644
--- a/libselinux/man/man3/security_policyvers.3
+++ b/libselinux/man/man3/security_policyvers.3
@@ -4,7 +4,7 @@ security_policyvers \- get the version of the SELinux policy
.SH "SYNOPSIS"
.B #include <selinux/selinux.h>
.sp
-.B int security_policyvers();
+.B int security_policyvers(void);
.
.SH "DESCRIPTION"
.BR security_policyvers ()
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] libselinux/man: add format attribute for set_matchpathcon_printf(3)
2024-04-29 16:31 [PATCH 1/5] libselinux/man: correct file extension of man pages Christian Göttsche
2024-04-29 16:31 ` [PATCH 2/5] libselinux/man: sync const qualifiers Christian Göttsche
2024-04-29 16:31 ` [PATCH 3/5] libselinux/man: use void in synopses Christian Göttsche
@ 2024-04-29 16:31 ` Christian Göttsche
2024-04-29 16:31 ` [PATCH 5/5] libselinux: constify selinux_set_mapping(3) parameter Christian Göttsche
2024-04-30 14:07 ` [PATCH 1/5] libselinux/man: correct file extension of man pages James Carter
4 siblings, 0 replies; 7+ messages in thread
From: Christian Göttsche @ 2024-04-29 16:31 UTC (permalink / raw
To: selinux; +Cc: Christian Göttsche
From: Christian Göttsche <cgzones@googlemail.com>
The parameter for set_matchpathcon_printf(3) is a function pointer that
takes a format string with variable arguments. Add a GNU printf
function attribute, if supported, to enable compilers checking for
format string inconsistencies.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
libselinux/include/selinux/selinux.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h
index a0948853..83ea871c 100644
--- a/libselinux/include/selinux/selinux.h
+++ b/libselinux/include/selinux/selinux.h
@@ -443,7 +443,11 @@ extern void selinux_flush_class_cache(void);
/* Set the function used by matchpathcon_init when displaying
errors about the file_contexts configuration. If not set,
then this defaults to fprintf(stderr, fmt, ...). */
-extern void set_matchpathcon_printf(void (*f) (const char *fmt, ...));
+extern void set_matchpathcon_printf(void
+#ifdef __GNUC__
+ __attribute__ ((format(printf, 1, 2)))
+#endif
+ (*f) (const char *fmt, ...));
/* Set the function used by matchpathcon_init when checking the
validity of a context in the file contexts configuration. If not set,
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] libselinux: constify selinux_set_mapping(3) parameter
2024-04-29 16:31 [PATCH 1/5] libselinux/man: correct file extension of man pages Christian Göttsche
` (2 preceding siblings ...)
2024-04-29 16:31 ` [PATCH 4/5] libselinux/man: add format attribute for set_matchpathcon_printf(3) Christian Göttsche
@ 2024-04-29 16:31 ` Christian Göttsche
2024-04-30 14:07 ` [PATCH 1/5] libselinux/man: correct file extension of man pages James Carter
4 siblings, 0 replies; 7+ messages in thread
From: Christian Göttsche @ 2024-04-29 16:31 UTC (permalink / raw
To: selinux; +Cc: Christian Göttsche
From: Christian Göttsche <cgzones@googlemail.com>
The map parameter of selinux_set_mapping(3) is only read from and not
modified, thus declare it const.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
libselinux/include/selinux/selinux.h | 2 +-
libselinux/man/man3/selinux_set_mapping.3 | 2 +-
libselinux/src/mapping.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h
index 83ea871c..61c1422b 100644
--- a/libselinux/include/selinux/selinux.h
+++ b/libselinux/include/selinux/selinux.h
@@ -413,7 +413,7 @@ struct security_class_mapping {
* starting at 1, and have one security_class_mapping structure entry
* per define.
*/
-extern int selinux_set_mapping(struct security_class_mapping *map);
+extern int selinux_set_mapping(const struct security_class_mapping *map);
/* Common helpers */
diff --git a/libselinux/man/man3/selinux_set_mapping.3 b/libselinux/man/man3/selinux_set_mapping.3
index a1f82e5a..bb48eb43 100644
--- a/libselinux/man/man3/selinux_set_mapping.3
+++ b/libselinux/man/man3/selinux_set_mapping.3
@@ -15,7 +15,7 @@ struct security_class_mapping {
};
.fi
.sp
-.BI "int selinux_set_mapping(struct security_class_mapping *" map ");"
+.BI "int selinux_set_mapping(const struct security_class_mapping *" map ");"
.
.SH "DESCRIPTION"
.BR selinux_set_mapping ()
diff --git a/libselinux/src/mapping.c b/libselinux/src/mapping.c
index dd2f1039..d863e449 100644
--- a/libselinux/src/mapping.c
+++ b/libselinux/src/mapping.c
@@ -31,7 +31,7 @@ static security_class_t current_mapping_size = 0;
*/
int
-selinux_set_mapping(struct security_class_mapping *map)
+selinux_set_mapping(const struct security_class_mapping *map)
{
size_t size = sizeof(struct selinux_mapping);
security_class_t i, j;
@@ -64,7 +64,7 @@ selinux_set_mapping(struct security_class_mapping *map)
/* Store the raw class and permission values */
j = 0;
while (map[j].name) {
- struct security_class_mapping *p_in = map + (j++);
+ const struct security_class_mapping *p_in = map + (j++);
struct selinux_mapping *p_out = current_mapping + j;
p_out->value = string_to_security_class(p_in->name);
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/5] libselinux/man: correct file extension of man pages
2024-04-29 16:31 [PATCH 1/5] libselinux/man: correct file extension of man pages Christian Göttsche
` (3 preceding siblings ...)
2024-04-29 16:31 ` [PATCH 5/5] libselinux: constify selinux_set_mapping(3) parameter Christian Göttsche
@ 2024-04-30 14:07 ` James Carter
2024-05-02 18:05 ` James Carter
4 siblings, 1 reply; 7+ messages in thread
From: James Carter @ 2024-04-30 14:07 UTC (permalink / raw
To: cgzones; +Cc: selinux
On Mon, Apr 29, 2024 at 12:31 PM Christian Göttsche
<cgoettsche@seltendoof.de> wrote:
>
> From: Christian Göttsche <cgzones@googlemail.com>
>
> Set the correct file extension .3 (instead of .c) for the
> security_validatetrans(3) and security_validatetrans_raw(3) man pages.
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
For these five patches:
Acked-by: James Carter <jwcart2@gmail.com>
> ---
> .../man3/{security_validatetrans.c => security_validatetrans.3} | 0
> ...{security_validatetrans_raw.c => security_validatetrans_raw.3} | 0
> 2 files changed, 0 insertions(+), 0 deletions(-)
> rename libselinux/man/man3/{security_validatetrans.c => security_validatetrans.3} (100%)
> rename libselinux/man/man3/{security_validatetrans_raw.c => security_validatetrans_raw.3} (100%)
>
> diff --git a/libselinux/man/man3/security_validatetrans.c b/libselinux/man/man3/security_validatetrans.3
> similarity index 100%
> rename from libselinux/man/man3/security_validatetrans.c
> rename to libselinux/man/man3/security_validatetrans.3
> diff --git a/libselinux/man/man3/security_validatetrans_raw.c b/libselinux/man/man3/security_validatetrans_raw.3
> similarity index 100%
> rename from libselinux/man/man3/security_validatetrans_raw.c
> rename to libselinux/man/man3/security_validatetrans_raw.3
> --
> 2.43.0
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/5] libselinux/man: correct file extension of man pages
2024-04-30 14:07 ` [PATCH 1/5] libselinux/man: correct file extension of man pages James Carter
@ 2024-05-02 18:05 ` James Carter
0 siblings, 0 replies; 7+ messages in thread
From: James Carter @ 2024-05-02 18:05 UTC (permalink / raw
To: cgzones; +Cc: selinux
On Tue, Apr 30, 2024 at 10:07 AM James Carter <jwcart2@gmail.com> wrote:
>
> On Mon, Apr 29, 2024 at 12:31 PM Christian Göttsche
> <cgoettsche@seltendoof.de> wrote:
> >
> > From: Christian Göttsche <cgzones@googlemail.com>
> >
> > Set the correct file extension .3 (instead of .c) for the
> > security_validatetrans(3) and security_validatetrans_raw(3) man pages.
> >
> > Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
>
> For these five patches:
> Acked-by: James Carter <jwcart2@gmail.com>
>
These five patches have been merged.
Thanks,
Jim
> > ---
> > .../man3/{security_validatetrans.c => security_validatetrans.3} | 0
> > ...{security_validatetrans_raw.c => security_validatetrans_raw.3} | 0
> > 2 files changed, 0 insertions(+), 0 deletions(-)
> > rename libselinux/man/man3/{security_validatetrans.c => security_validatetrans.3} (100%)
> > rename libselinux/man/man3/{security_validatetrans_raw.c => security_validatetrans_raw.3} (100%)
> >
> > diff --git a/libselinux/man/man3/security_validatetrans.c b/libselinux/man/man3/security_validatetrans.3
> > similarity index 100%
> > rename from libselinux/man/man3/security_validatetrans.c
> > rename to libselinux/man/man3/security_validatetrans.3
> > diff --git a/libselinux/man/man3/security_validatetrans_raw.c b/libselinux/man/man3/security_validatetrans_raw.3
> > similarity index 100%
> > rename from libselinux/man/man3/security_validatetrans_raw.c
> > rename to libselinux/man/man3/security_validatetrans_raw.3
> > --
> > 2.43.0
> >
> >
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-05-02 18:05 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-29 16:31 [PATCH 1/5] libselinux/man: correct file extension of man pages Christian Göttsche
2024-04-29 16:31 ` [PATCH 2/5] libselinux/man: sync const qualifiers Christian Göttsche
2024-04-29 16:31 ` [PATCH 3/5] libselinux/man: use void in synopses Christian Göttsche
2024-04-29 16:31 ` [PATCH 4/5] libselinux/man: add format attribute for set_matchpathcon_printf(3) Christian Göttsche
2024-04-29 16:31 ` [PATCH 5/5] libselinux: constify selinux_set_mapping(3) parameter Christian Göttsche
2024-04-30 14:07 ` [PATCH 1/5] libselinux/man: correct file extension of man pages James Carter
2024-05-02 18:05 ` James Carter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).