libselinux: refactor wrapper in sestatus.c for safe shared memory access
PATCH 1/3 libselinux: refactor wrapper in sestatus.c for safe shared memory access
--- libselinux/src/sestatus.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-)
libselinux/src/sestatus.c +11 -24
@@ -80,6 +80,14 @@ static inline uint32_t read_sequence(struct selinux_status_t *status)return seqno; } +/* sequence must not be changed during references */ +#define sestatus_save_access (name, result) \ + uint32_t _seqno; \ + do { \ + _seqno = read_sequence(selinux_status); \ + (result) = selinux_status->name; \ + } while (_seqno != read_sequence(selinux_status)) \ +/* * selinux_status_updated *
@@ -142,7 +150,6 @@ int selinux_status_updated(void)*/ int selinux_status_getenforce (void ) { -uint32_t seqno;uint32_t enforcing;if (selinux_status ==NULL ) {
@@ -157,13 +164,7 @@ int selinux_status_getenforce(void)return fallback_enforcing; } -/* sequence must not be changed during references */ -do { - seqno =read_sequence (selinux_status); - - enforcing = selinux_status->enforcing; - - }while (seqno !=read_sequence (selinux_status)); +sestatus_save_access (enforcing, enforcing);return enforcing ?1 :0 ; }
@@ -179,7 +180,6 @@ int selinux_status_getenforce(void)*/ int selinux_status_policyload (void ) { -uint32_t seqno;uint32_t policyload;if (selinux_status ==NULL ) {
@@ -194,13 +194,7 @@ int selinux_status_policyload(void)return fallback_policyload; } -/* sequence must not be changed during references */ -do { - seqno =read_sequence (selinux_status); - - policyload = selinux_status->policyload; - - }while (seqno !=read_sequence (selinux_status)); +sestatus_save_access (policyload, policyload);return policyload; }
@@ -214,7 +208,6 @@ int selinux_status_policyload(void)*/ int selinux_status_deny_unknown (void ) { -uint32_t seqno;uint32_t deny_unknown;if (selinux_status ==NULL ) {
@@ -225,13 +218,7 @@ int selinux_status_deny_unknown(void)if (selinux_status ==MAP_FAILED )return security_deny_unknown (); -/* sequence must not be changed during references */ -do { - seqno =read_sequence (selinux_status); - - deny_unknown = selinux_status->deny_unknown; - - }while (seqno !=read_sequence (selinux_status)); +sestatus_save_access (deny_unknown, deny_unknown);return deny_unknown ?1 :0 ; }
Signature · 1 line
2.28.0
PATCH 2/3 libselinux: safely access shared memory in selinux_status_updated()
--- libselinux/src/sestatus.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-)
libselinux/src/sestatus.c +24 -15
@@ -99,7 +99,9 @@ static inline uint32_t read_sequence(struct selinux_status_t *status)int selinux_status_updated (void ) {uint32_t curr_seqno; -int result =0 ; +uint32_t tmp_seqno; +uint32_t enforcing; +uint32_t policyload;if (selinux_status ==NULL ) { errno =EINVAL ;
@@ -125,21 +127,28 @@ int selinux_status_updated(void)if (last_seqno &0x0001 ) last_seqno = curr_seqno; -if (last_seqno != curr_seqno) - { -if (avc_enforcing != (int ) selinux_status->enforcing) { -if (avc_process_setenforce (selinux_status->enforcing) <0 ) -return -1 ; - } -if (last_policyload != selinux_status->policyload) { -if (avc_process_policyload (selinux_status->policyload) <0 ) -return -1 ; - last_policyload = selinux_status->policyload; - } - last_seqno = curr_seqno; - result =1 ; +if (last_seqno == curr_seqno) +return 0 ; + +do { + enforcing = selinux_status->enforcing; + policyload = selinux_status->policyload; + tmp_seqno = curr_seqno; + curr_seqno =read_sequence (selinux_status); + }while (tmp_seqno != curr_seqno); + +if (avc_enforcing != (int ) enforcing) { +if (avc_process_setenforce (enforcing) <0 ) +return -1 ; } -return result; +if (last_policyload != policyload) { +if (avc_process_policyload (policyload) <0 ) +return -1 ; + last_policyload = policyload; + } + last_seqno = curr_seqno; + +return 1 ; }/*
Signature · 1 line
2.28.0
PATCH 3/3 libselinux: initialize last_policyload in selinux_status_open()
In reply to Christian GöttscheIf not initialized to the current policyload count, an enforcing change will trigger policyload-callbacks in selinux_status_updated().
--- libselinux/src/sestatus.c | 1 + 1 file changed, 1 insertion(+)
libselinux/src/sestatus.c +1 -0
@@ -289,6 +289,7 @@ int selinux_status_open(int fallback) } selinux_status_fd = fd; last_seqno = (uint32_t )(-1 ); +sestatus_save_access (policyload, last_policyload);/* No need to use avc threads if the kernel status page is available */ avc_using_threads =0 ;
Signature · 1 line
2.28.0
Stephen Smalley
maintainerQuoted 11 lines · Christian Göttsche
Signed-off-by Christian Göttsche <[email protected]>--- libselinux/src/sestatus.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-)libselinux/src/sestatus.c +0
-0
libselinux/src/sestatus.c static inline uint32_t read_sequence(struct selinux_status_t *status) · line 89
Quoted 10 lines
libselinux/src/sestatus.c +7
-0@@ -80,6 +80,14 @@ static inline uint32_t read_sequence(struct selinux_status_t *status)return seqno; } +/* sequence must not be changed during references */ +#define sestatus_save_access (name, result) \ + uint32_t _seqno; \ + do { \ + _seqno = read_sequence(selinux_status); \ + (result) = selinux_status->name; \ + } while (_seqno != read_sequence(selinux_status)) \
I'm not sure how much we gain from this macro versus losing in readability of the calling code.
It should be clear at the call site that we are setting result to the value of selinux_status->name, either by
having the macro "return" the value to the caller or passing the address of result.
If we are going to use a macro with a local variable declaration, then it needs to be wrapped with do { ... } while (0)
to ensure that the variable has its own scope/block.
I'm also not clear on the naming - why "save_access" - is that supposed to be "safe_access"?
It would be nice if the trailing backslashes were aligned. To be clear, this code is not currently thread-safe; the "safety" has to do with getting a consistent view of the SELinux kernel status page.
libselinux/src/sestatus.c int selinux_status_getenforce(void) · line 167
Quoted 12 lines
libselinux/src/sestatus.c +1
-7@@ -157,13 +164,7 @@ int selinux_status_getenforce(void)return fallback_enforcing; } -/* sequence must not be changed during references */ -do { - seqno =read_sequence (selinux_status); - - enforcing = selinux_status->enforcing; - - }while (seqno !=read_sequence (selinux_status)); +sestatus_save_access (enforcing, enforcing);
Someone reading the above code snippet has no idea that we just set enforcing to selinux_status->enforcing.
v2 cover selinux_status_ changes
In reply to Christian GöttscheDropped first patch refactoring the access to the shared structure.
Christian Göttsche (2):
libselinux: safely access shared memory in selinux_status_updated()
libselinux: initialize last_policyload in selinux_status_open()
libselinux/src/sestatus.c | 55 ++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 18 deletions(-)
Signature · 1 line
2.28.0
PATCH v2 1/2 libselinux: safely access shared memory in selinux_status_updated()
Access the shared nenory safe in regard to consistent view of the SELinux kernel status page - not in regard to thread-safety.
--- libselinux/src/sestatus.c | 40 ++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-)
libselinux/src/sestatus.c +25 -15
@@ -91,7 +91,9 @@ static inline uint32_t read_sequence(struct selinux_status_t *status)int selinux_status_updated (void ) {uint32_t curr_seqno; -int result =0 ; +uint32_t tmp_seqno; +uint32_t enforcing; +uint32_t policyload;if (selinux_status ==NULL ) { errno =EINVAL ;
@@ -117,21 +119,29 @@ int selinux_status_updated(void)if (last_seqno &0x0001 ) last_seqno = curr_seqno; -if (last_seqno != curr_seqno) - { -if (avc_enforcing != (int ) selinux_status->enforcing) { -if (avc_process_setenforce (selinux_status->enforcing) <0 ) -return -1 ; - } -if (last_policyload != selinux_status->policyload) { -if (avc_process_policyload (selinux_status->policyload) <0 ) -return -1 ; - last_policyload = selinux_status->policyload; - } - last_seqno = curr_seqno; - result =1 ; +if (last_seqno == curr_seqno) +return 0 ; + +/* sequence must not be changed during references */ +do { + enforcing = selinux_status->enforcing; + policyload = selinux_status->policyload; + tmp_seqno = curr_seqno; + curr_seqno =read_sequence (selinux_status); + }while (tmp_seqno != curr_seqno); + +if (avc_enforcing != (int ) enforcing) { +if (avc_process_setenforce (enforcing) <0 ) +return -1 ; + } +if (last_policyload != policyload) { +if (avc_process_policyload (policyload) <0 ) +return -1 ; + last_policyload = policyload; } -return result; + last_seqno = curr_seqno; + +return 1 ; }/*
Signature · 1 line
2.28.0
Re: [PATCH v2 1/2] libselinux: safely access shared memory in selinux_status_updated()
Quoted 2 lines · Christian Göttsche
Access the shared nenory safe in regard to consistent view of the SELinux
s/nenory/memory/
Quoted 3 lines
kernel status page - not in regard to thread-safety.
Signed-off-by Christian Göttsche <[email protected]>
PATCH v2 2/2 libselinux: initialize last_policyload in selinux_status_open()
In reply to Christian GöttscheIf not initialized to the current policyload count, an enforcing change will trigger policyload-callbacks in selinux_status_updated().
--- libselinux/src/sestatus.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
libselinux/src/sestatus.c +12 -3
@@ -278,9 +278,10 @@ static int fallback_cb_policyload(int policyload)*/ int selinux_status_open (int fallback) { -int fd; -char path[PATH_MAX ]; -long pagesize; +int fd; +char path[PATH_MAX ]; +long pagesize; +uint32_t seqno;if (!selinux_mnt) { errno =ENOENT ;
@@ -304,6 +305,14 @@ int selinux_status_open(int fallback) selinux_status_fd = fd; last_seqno = (uint32_t )(-1 ); +/* sequence must not be changed during references */ +do { + seqno =read_sequence (selinux_status); + + last_policyload = selinux_status->policyload; + + }while (seqno !=read_sequence (selinux_status)); +/* No need to use avc threads if the kernel status page is available */ avc_using_threads =0 ;
Signature · 1 line
2.28.0
Re: [PATCH v2 2/2] libselinux: initialize last_policyload in selinux_status_open()
Quoted 5 lines · Christian Göttsche
If not initialized to the current policyload count, an enforcing change will trigger policyload-callbacks in
selinux_status_updated().Signed-off-by Christian Göttsche <[email protected]>
Stephen Smalley
maintainerRe: [PATCH v2 2/2] libselinux: initialize last_policyload in selinux_status_open()
Quoted 10 lines · Stephen Smalley
Quoted 5 lines · Christian Göttsche
If not initialized to the current policyload count, an enforcing change will trigger policyload-callbacks in
selinux_status_updated().Signed-off-by Christian Göttsche <[email protected]>Acked-by Stephen Smalley <[email protected]>
Both applied.