libsepol: do not modify policy during write
PATCH 1/1 libsepol: do not modify policy during write
Do not modify the in memory default_range value of a class datum while writing a policy.
While on it fix indentation.
Signed-off-by Christian Göttsche <[email protected]>
--- libsepol/src/write.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
libsepol/src/write.c +9 -7
@@ -1097,16 +1097,18 @@ static int class_write(hashtab_key_t key, hashtab_datum_t datum, void *ptr) p->policyvers >= POLICYDB_VERSION_NEW_OBJECT_DEFAULTS) || (p->policy_type == POLICY_BASE && p->policyvers >= MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS)) { +char default_range = cladatum->default_range; + buf[0 ] =cpu_to_le32 (cladatum->default_user); buf[1 ] =cpu_to_le32 (cladatum->default_role); -if (!glblub_version && cladatum->default_range ==DEFAULT_GLBLUB ) { +if (!glblub_version && default_range ==DEFAULT_GLBLUB ) {WARN (fp->handle, -"class %s default_range set to GLBLUB but policy version is %d (%d required), discarding" , - p->p_class_val_to_name[cladatum->s.value -1 ], p->policyvers, - p->policy_type ==POLICY_KERN ?POLICYDB_VERSION_GLBLUB :MOD_POLICYDB_VERSION_GLBLUB ); - cladatum->default_range =0 ; - } - buf[2 ] =cpu_to_le32 (cladatum->default_range); +"class %s default_range set to GLBLUB but policy version is %d (%d required), discarding" , + p->p_class_val_to_name[cladatum->s.value -1 ], p->policyvers, + p->policy_type ==POLICY_KERN ?POLICYDB_VERSION_GLBLUB :MOD_POLICYDB_VERSION_GLBLUB ); + default_range =0 ; + } + buf[2 ] =cpu_to_le32 (default_range); items =put_entry (buf,sizeof (uint32_t ),3 , fp);if (items !=3 )return POLICYDB_ERROR ;
Signature · 1 line
2.36.1
Quoted 7 lines · Christian Göttsche
Do not modify the in memory
default_rangevalue of a class datum while writing a policy.While on it fix indentation.
Signed-off-by Christian Göttsche <[email protected]>
Acked-by James Carter <[email protected]>
Quoted 37 lines
--- libsepol/src/write.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)libsepol/src/write.c +9
-8@@ -1097,16 +1097,18 @@ static int class_write(hashtab_key_t key, hashtab_datum_t datum, void *ptr) p->policyvers >= POLICYDB_VERSION_NEW_OBJECT_DEFAULTS) || (p->policy_type == POLICY_BASE && p->policyvers >= MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS)) { +char default_range = cladatum->default_range; + buf[0 ] =cpu_to_le32 (cladatum->default_user); buf[1 ] =cpu_to_le32 (cladatum->default_role); -if (!glblub_version && cladatum->default_range ==DEFAULT_GLBLUB ) { +if (!glblub_version && default_range ==DEFAULT_GLBLUB ) {WARN (fp->handle, -"class %s default_range set to GLBLUB but policy version is %d (%d required), discarding" , - p->p_class_val_to_name[cladatum->s.value -1 ], p->policyvers, - p->policy_type ==POLICY_KERN ?POLICYDB_VERSION_GLBLUB :MOD_POLICYDB_VERSION_GLBLUB ); - cladatum->default_range =0 ; - } - buf[2 ] =cpu_to_le32 (cladatum->default_range); +"class %s default_range set to GLBLUB but policy version is %d (%d required), discarding" , + p->p_class_val_to_name[cladatum->s.value -1 ], p->policyvers, + p->policy_type ==POLICY_KERN ?POLICYDB_VERSION_GLBLUB :MOD_POLICYDB_VERSION_GLBLUB ); + default_range =0 ; + } + buf[2 ] =cpu_to_le32 (default_range); items =put_entry (buf,sizeof (uint32_t ),3 , fp);if (items !=3 )return POLICYDB_ERROR ; --2.36.1
Quoted 4 lines · James Carter
Quoted 1 line · Christian Göttsche
Quoted 9 lines
Quoted 6 lines
Do not modify the in memory
default_rangevalue of a class datum while writing a policy.While on it fix indentation.
Signed-off-by Christian Göttsche <[email protected]>Acked-by James Carter <[email protected]>
Merged.
Thanks,
Jim
Quoted 37 lines
Quoted 37 lines
--- libsepol/src/write.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)libsepol/src/write.c +9
-8@@ -1097,16 +1097,18 @@ static int class_write(hashtab_key_t key, hashtab_datum_t datum, void *ptr) p->policyvers >= POLICYDB_VERSION_NEW_OBJECT_DEFAULTS) || (p->policy_type == POLICY_BASE && p->policyvers >= MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS)) { +char default_range = cladatum->default_range; + buf[0 ] =cpu_to_le32 (cladatum->default_user); buf[1 ] =cpu_to_le32 (cladatum->default_role); -if (!glblub_version && cladatum->default_range ==DEFAULT_GLBLUB ) { +if (!glblub_version && default_range ==DEFAULT_GLBLUB ) {WARN (fp->handle, -"class %s default_range set to GLBLUB but policy version is %d (%d required), discarding" , - p->p_class_val_to_name[cladatum->s.value -1 ], p->policyvers, - p->policy_type ==POLICY_KERN ?POLICYDB_VERSION_GLBLUB :MOD_POLICYDB_VERSION_GLBLUB ); - cladatum->default_range =0 ; - } - buf[2 ] =cpu_to_le32 (cladatum->default_range); +"class %s default_range set to GLBLUB but policy version is %d (%d required), discarding" , + p->p_class_val_to_name[cladatum->s.value -1 ], p->policyvers, + p->policy_type ==POLICY_KERN ?POLICYDB_VERSION_GLBLUB :MOD_POLICYDB_VERSION_GLBLUB ); + default_range =0 ; + } + buf[2 ] =cpu_to_le32 (default_range); items =put_entry (buf,sizeof (uint32_t ),3 , fp);if (items !=3 )return POLICYDB_ERROR ; --2.36.1