| Message ID | 20210601150523.7016-1-cgzones@googlemail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | libselinux: selinux_status_open: return 1 in fallback mode | expand |
Christian Göttsche <cgzones@googlemail.com> writes: > In case of a recurring call to `selinux_status_open(3)`, which > previously has been opened in fallback mode, return `1` according to its > documentation. > > Fixes: c5a699046f4 ("libselinux: make selinux_status_open(3) reentrant") > > Signed-off-by: Christian Göttsche <cgzones@googlemail.com> > Acked-by: Petr Lautrbach <plautrba@redhat.com> > --- > libselinux/src/sestatus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libselinux/src/sestatus.c b/libselinux/src/sestatus.c > index 531a522c..89c1f621 100644 > --- a/libselinux/src/sestatus.c > +++ b/libselinux/src/sestatus.c > @@ -283,7 +283,7 @@ int selinux_status_open(int fallback) > uint32_t seqno; > > if (selinux_status != NULL) { > - return 0; > + return (selinux_status == MAP_FAILED) ? 1 : 0; > } > > if (!selinux_mnt) { > -- > 2.32.0.rc2
Petr Lautrbach <plautrba@redhat.com> writes: > Christian Göttsche <cgzones@googlemail.com> writes: > >> In case of a recurring call to `selinux_status_open(3)`, which >> previously has been opened in fallback mode, return `1` according to its >> documentation. >> >> Fixes: c5a699046f4 ("libselinux: make selinux_status_open(3) reentrant") >> >> Signed-off-by: Christian Göttsche <cgzones@googlemail.com> >> > > Acked-by: Petr Lautrbach <plautrba@redhat.com> This is merged now. Thanks! > >> --- >> libselinux/src/sestatus.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libselinux/src/sestatus.c b/libselinux/src/sestatus.c >> index 531a522c..89c1f621 100644 >> --- a/libselinux/src/sestatus.c >> +++ b/libselinux/src/sestatus.c >> @@ -283,7 +283,7 @@ int selinux_status_open(int fallback) >> uint32_t seqno; >> >> if (selinux_status != NULL) { >> - return 0; >> + return (selinux_status == MAP_FAILED) ? 1 : 0; >> } >> >> if (!selinux_mnt) { >> -- >> 2.32.0.rc2
diff --git a/libselinux/src/sestatus.c b/libselinux/src/sestatus.c index 531a522c..89c1f621 100644 --- a/libselinux/src/sestatus.c +++ b/libselinux/src/sestatus.c @@ -283,7 +283,7 @@ int selinux_status_open(int fallback) uint32_t seqno; if (selinux_status != NULL) { - return 0; + return (selinux_status == MAP_FAILED) ? 1 : 0; } if (!selinux_mnt) {
In case of a recurring call to `selinux_status_open(3)`, which previously has been opened in fallback mode, return `1` according to its documentation. Fixes: c5a699046f4 ("libselinux: make selinux_status_open(3) reentrant") Signed-off-by: Christian Göttsche <cgzones@googlemail.com> --- libselinux/src/sestatus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)