FAILED: patch "[PATCH] selinux: require a class's permission values to cover its" failed to apply to 7.1-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 7.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-7.1.y
git checkout FETCH_HEAD
git cherry-pick -x b98a8ac50775540f3804397ed08f61ef9910bcab
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026082020-unnatural-animosity-f5e9@gregkh' --subject-prefix 'PATCH 7.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From b98a8ac50775540f3804397ed08f61ef9910bcab Mon Sep 17 00:00:00 2001
From: Bryam Vargas <[email protected]>
Date: Fri, 31 Jul 2026 12:44:10 -0500
Subject: [PATCH] selinux: require a class's permission values to cover its
permission count
security_get_permissions() sizes an array by the class's permissions.nprim and fills it at value - 1, from the inherited common's permission table and then the class's own. A value no permission defines leaves a NULL that sel_make_perm_files() passes to d_alloc_name(), an oops inside sel_write_load() that strands selinux_state.policy_mutex and leaves every later load in uninterruptible sleep; two permissions sharing a value overwrite the first kstrdup(). Bounding each value by nprim catches neither, and neither would a count: the symbol table is keyed on the permission name, so duplicates pass.
Track the values each permission table claims and require them to cover exactly what its count declares, rejecting a count no value can reach. Conforming policies are unaffected.
security/selinux/ss/policydb.c +46 -5
@@ -1154,7 +1154,18 @@ int str_read(char **strp, gfp_t flags, struct policy_file *fp, u32 len)return 0 ; } -static int perm_read (struct policydb *p,struct symtab *s,struct policy_file *fp) +/* +* Bitmap of the permission values a symtab has claimed. Values are 1-based +* and bounded by SEL_VEC_MAX, the width of an access vector, so the whole set +* fits in a u32 and the callers reject an nprim past that width. +*/ +static u32 perm_claimed_mask (u32 nprim) +{ +return nprim ?U32_MAX >> (SEL_VEC_MAX - nprim) :0 ; +} + +static int perm_read (struct policydb *p,struct symtab *s, +struct policy_file *fp,u32 *claimed) {char *key =NULL ;struct perm_datum *perdatum;
@@ -1178,6 +1189,10 @@ static int perm_read(struct policydb *p, struct symtab *s, struct policy_file *f/* indexes an nprim-sized array in security_get_permissions() */ if (perdatum->value > s->nprim) goto bad; +/* two permissions cannot share one slot of that array */ +if (*claimed & (1U << (perdatum->value -1 ))) + goto bad; + *claimed |=1U << (perdatum->value -1 ); rc =str_read (&key,GFP_KERNEL , fp, len);if (rc)
@@ -1198,7 +1213,7 @@ static int common_read(struct policydb *p, struct symtab *s, struct policy_filechar *key =NULL ;struct common_datum *comdatum;__le32 buf[4 ]; -u32 i, len, nel; +u32 i, len, nel, claimed =0 ;int rc; comdatum =kzalloc_obj (*comdatum);
@@ -1225,17 +1240,28 @@ static int common_read(struct policydb *p, struct symtab *s, struct policy_fileif (rc) goto bad; comdatum->permissions.nprim =le32_to_cpu (buf[2 ]); +/* no permission value can reach a slot past SEL_VEC_MAX */ + rc = -EINVAL ; +if (comdatum->permissions.nprim >SEL_VEC_MAX ) + goto bad; rc =str_read (&key,GFP_KERNEL , fp, len);if (rc) goto bad;for (i =0 ; i < nel; i++) { - rc =perm_read (p, &comdatum->permissions, fp); + rc =perm_read (p, &comdatum->permissions, fp, &claimed);if (rc) goto bad; } + rc = -EINVAL ; +if (claimed !=perm_claimed_mask (comdatum->permissions.nprim)) { +pr_err ("SELinux: common %s does not define every permission it declares\n" , + key); + goto bad; + } +hash_eval (&comdatum->permissions.table,"common_permissions" , key); rc =symtab_insert (s, key, comdatum);
@@ -1369,7 +1395,7 @@ static int class_read(struct policydb *p, struct symtab *s, struct policy_file *char *key =NULL ;struct class_datum *cladatum;__le32 buf[6 ]; -u32 i, len, len2, ncons, nel, val; +u32 i, len, len2, ncons, nel, val, claimed =0 , inherited =0 ;int rc; cladatum =kzalloc_obj (*cladatum);
@@ -1402,6 +1428,10 @@ static int class_read(struct policydb *p, struct symtab *s, struct policy_file *if (rc) goto bad; cladatum->permissions.nprim =le32_to_cpu (buf[3 ]); +/* no permission value can reach a slot past SEL_VEC_MAX */ + rc = -EINVAL ; +if (cladatum->permissions.nprim >SEL_VEC_MAX ) + goto bad; ncons =le32_to_cpu (buf[5 ]);
@@ -1436,11 +1466,22 @@ static int class_read(struct policydb *p, struct symtab *s, struct policy_file * } }for (i =0 ; i < nel; i++) { - rc =perm_read (p, &cladatum->permissions, fp); + rc =perm_read (p, &cladatum->permissions, fp, &claimed);if (rc) goto bad; } +/* the class's own permissions must claim the slots the common leaves */ +if (cladatum->comdatum) + inherited = cladatum->comdatum->permissions.nprim; + rc = -EINVAL ; +if (claimed != (perm_claimed_mask (cladatum->permissions.nprim) & + ~perm_claimed_mask (inherited))) { +pr_err ("SELinux: class %s does not define every permission it declares\n" , + key); + goto bad; + } +hash_eval (&cladatum->permissions.table,"class_permissions" , key); rc =read_cons_helper (p, &cladatum->constraints, ncons,0 , fp);
Sasha Levin
maintainerPATCH 1/3 selinux: use u16 for security classes
From: Christian Göttsche <[email protected]>
[ Upstream commit fa79a596848fe38c55ccab8832ac35dac07fb00c ]
Security class identifiers are limited to 2^16, thus use the appropriate type u16 consistently.
Stable-dep-of: b98a8ac50775 ("selinux: require a class's permission values to cover its permission count")
--- security/selinux/ss/policydb.c | 5 +++-- security/selinux/ss/policydb.h | 10 +++++----- security/selinux/ss/services.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-)
security/selinux/ss/policydb.c +3 -2
@@ -950,7 +950,7 @@ int policydb_load_isids(struct policydb *p, struct sidtab *s)return 0 ; } -int policydb_class_isvalid (struct policydb *p,unsigned int class) +int policydb_class_isvalid (struct policydb *p,u16 class) {if (!class || class > p->p_classes.nprim)return 0 ;
@@ -2039,7 +2039,8 @@ static int filename_trans_read_helper(struct policydb *p, struct policy_file *fpstruct filename_trans_key *ft =NULL ;struct filename_trans_datum **dst, *datum, *first =NULL ;char *name =NULL ; -u32 len, ttype, tclass, ndatum, i; +u32 len, ttype, ndatum, i; +u16 tclass;__le32 buf[3 ];int rc;
security/selinux/ss/policydb.h +5 -5
@@ -48,7 +48,7 @@ struct common_datum {/* Class attributes */ struct class_datum { -u32 value;/* class value */ +u16 value;/* class value */ char *comkey;/* common name */ struct common_datum *comdatum;/* common datum */ struct symtab permissions;/* class-specific permission symbol table */
@@ -82,7 +82,7 @@ struct role_datum {struct role_trans_key {u32 role;/* current role */ u32 type;/* program executable type, or new object type */ -u32 tclass;/* process class, or new object class */ +u16 tclass;/* process class, or new object class */ };struct role_trans_datum {
@@ -139,7 +139,7 @@ struct cat_datum {struct range_trans {u32 source_type;u32 target_type; -u32 target_class; +u16 target_class; };/* Boolean data type */
@@ -195,7 +195,7 @@ struct ocontext { } ibendport; } u;union { -u32 sclass;/* security class for genfs */ +u16 sclass;/* security class for genfs */ u32 behavior;/* labeling behavior for fs_use */ } v;struct context context[2 ];/* security context(s) */
@@ -322,7 +322,7 @@ struct policy_file {extern void policydb_destroy (struct policydb *p);extern int policydb_load_isids (struct policydb *p,struct sidtab *s);extern int policydb_context_isvalid (struct policydb *p,struct context *c); -extern int policydb_class_isvalid (struct policydb *p,unsigned int class); +extern int policydb_class_isvalid (struct policydb *p,u16 class);extern int policydb_type_isvalid (struct policydb *p,unsigned int type);extern int policydb_role_isvalid (struct policydb *p,unsigned int role);extern int policydb_read (struct policydb *p,struct policy_file *fp);
security/selinux/ss/services.c +1 -1
@@ -3290,7 +3290,7 @@ static int get_classes_callback(void *k, void *d, void *args) {struct class_datum *datum = d;char *name = k, **classes = args; -u32 value = datum->value -1 ; +u16 value = datum->value -1 ; classes[value] =kstrdup (name,GFP_ATOMIC );if (!classes[value])
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 selinux: more strict policy parsing
From: Christian Göttsche <[email protected]>
[ Upstream commit 18fa21f10d008a0fc22565109c7d38f304295912 ]
Be more strict during parsing of policies and reject invalid values.
Add some error messages in the case of policy parse failures, to enhance debugging, either on a malformed policy or a too strict check.
Stable-dep-of: b98a8ac50775 ("selinux: require a class's permission values to cover its permission count")
--- security/selinux/include/security.h | 1 + security/selinux/ss/avtab.c | 35 ++++- security/selinux/ss/avtab.h | 13 ++ security/selinux/ss/conditional.c | 18 +-- security/selinux/ss/constraint.h | 1 + security/selinux/ss/policydb.c | 196 +++++++++++++++++++++++----- security/selinux/ss/policydb.h | 23 +++- security/selinux/ss/services.c | 6 +- 8 files changed, 233 insertions(+), 60 deletions(-)
security/selinux/include/security.h +1 -0
@@ -236,6 +236,7 @@ int security_read_policy(void **data, size_t *len);int security_read_state_kernel (void **data,size_t *len);int security_policycap_supported (unsigned int req_cap); +/* Maximum supported number of permissions per class */ #define SEL_VEC_MAX 32struct av_decision {u32 allowed;
security/selinux/ss/avtab.c +29 -6
@@ -316,7 +316,7 @@ int avtab_read_item(struct avtab *a, struct policy_file *fp, struct policydb *postruct avtab_extended_perms xperms;__le32 buf32[ARRAY_SIZE (xperms.perms.p)];int rc; -unsigned int set, vers = pol->policyvers; +unsigned int vers = pol->policyvers;memset (&key,0 ,sizeof (struct avtab_key ));memset (&datum,0 ,sizeof (struct avtab_datum ));
@@ -327,9 +327,12 @@ int avtab_read_item(struct avtab *a, struct policy_file *fp, struct policydb *popr_err ("SELinux: avtab: truncated entry\n" );return rc; } +/* Read five or more items: source type, target type, +* target class, AV type, and at least one datum. +*/ items2 =le32_to_cpu (buf32[0 ]); -if (items2 >ARRAY_SIZE (buf32)) { -pr_err ("SELinux: avtab: entry overflow\n" ); +if (items2 <5 || items2 >ARRAY_SIZE (buf32)) { +pr_err ("SELinux: avtab: invalid item count\n" );return -EINVAL ; } rc =next_entry (buf32, fp,sizeof (u32) * items2);
@@ -358,6 +361,13 @@ int avtab_read_item(struct avtab *a, struct policy_file *fp, struct policydb *poreturn -EINVAL ; } +if (!policydb_type_isvalid (pol, key.source_type) || + !policydb_type_isvalid (pol, key.target_type) || + !policydb_class_isvalid (pol, key.target_class)) { +pr_err ("SELinux: avtab: invalid type or class\n" ); +return -EINVAL ; + } + val =le32_to_cpu (buf32[items++]); enabled = (val &AVTAB_ENABLED_OLD ) ?AVTAB_ENABLED :0 ;
@@ -376,6 +386,11 @@ int avtab_read_item(struct avtab *a, struct policy_file *fp, struct policydb *pofor (i =0 ; i <ARRAY_SIZE (spec_order); i++) {if (val & spec_order[i]) { +if (items >= items2) { +pr_err ("SELinux: avtab: entry has too many items (%d/%d)\n" , + items +1 , items2); +return -EINVAL ; + } key.specified = spec_order[i] | enabled; datum.u.data =le32_to_cpu (buf32[items++]); rc =insertf (a, &key, &datum, p);
@@ -411,9 +426,13 @@ int avtab_read_item(struct avtab *a, struct policy_file *fp, struct policydb *poreturn -EINVAL ; } - set =hweight16 (key.specified & (AVTAB_XPERMS |AVTAB_TYPE |AVTAB_AV )); -if (!set || set >1 ) { -pr_err ("SELinux: avtab: more than one specifier\n" ); +if (hweight16 (key.specified & ~AVTAB_ENABLED ) !=1 ) { +pr_err ("SELinux: avtab: not exactly one specifier\n" ); +return -EINVAL ; + } + +if (key.specified & ~AVTAB_SPECIFIER_MASK ) { +pr_err ("SELinux: avtab: invalid specifier\n" );return -EINVAL ; }
@@ -438,6 +457,10 @@ int avtab_read_item(struct avtab *a, struct policy_file *fp, struct policydb *popr_err ("SELinux: avtab: truncated entry\n" );return rc; } +if (!avtab_is_valid_xperm_specified (xperms.specified)) +pr_warn_once_policyload (pol, +"SELinux: avtab: unsupported xperm specifier %#x\n" , + xperms.specified); rc =next_entry (&xperms.driver, fp,sizeof (u8));if (rc) {pr_err ("SELinux: avtab: truncated entry\n" );
security/selinux/ss/avtab.h +13 -0
@@ -44,6 +44,7 @@ struct avtab_key { AVTAB_XPERMS_DONTAUDIT)#define AVTAB_ENABLED_OLD 0x80000000/* reserved for used in cond_avtab */ #define AVTAB_ENABLED 0x8000/* reserved for used in cond_avtab */ +#define AVTAB_SPECIFIER_MASK (AVTAB_AV | AVTAB_TYPE | AVTAB_XPERMS | AVTAB_ENABLED)u16 specified;/* what field is specified */ };
@@ -68,6 +69,18 @@ struct avtab_extended_perms {struct extended_perms_data perms; }; +static inline bool avtab_is_valid_xperm_specified (u8 specified) +{ +switch (specified) { +case AVTAB_XPERMS_IOCTLFUNCTION : +case AVTAB_XPERMS_IOCTLDRIVER : +case AVTAB_XPERMS_NLMSG : +return true; +default : +return false; + } +} +struct avtab_datum {union {u32 data;/* access vector or type value */
security/selinux/ss/conditional.c +7 -11
@@ -199,19 +199,12 @@ int cond_index_bool(void *key, void *datum, void *datap)return 0 ; } -static int bool_isvalid (struct cond_bool_datum *b) -{ -if (!(b->state ==0 || b->state ==1 )) -return 0 ; -return 1 ; -} -int cond_read_bool (struct policydb *p,struct symtab *s,struct policy_file *fp) {char *key =NULL ;struct cond_bool_datum *booldatum;__le32 buf[3 ]; -u32 len; +u32 len, val;int rc; booldatum =kzalloc_obj (*booldatum);
@@ -223,11 +216,12 @@ int cond_read_bool(struct policydb *p, struct symtab *s, struct policy_file *fp) goto err; booldatum->value =le32_to_cpu (buf[0 ]); - booldatum->state =le32_to_cpu (buf[1 ]); + val =le32_to_cpu (buf[1 ]); rc = -EINVAL ; -if (!bool_isvalid (booldatum)) +if (!val_is_boolean (val)) goto err; + booldatum->state = (int )val; len =le32_to_cpu (buf[2 ]);
@@ -241,6 +235,7 @@ int cond_read_bool(struct policydb *p, struct symtab *s, struct policy_file *fp)return 0 ; err: +pr_err ("SELinux: conditional: failed to read boolean\n" );cond_destroy_bool (key, booldatum,NULL );return rc; }
@@ -362,7 +357,8 @@ static int expr_node_isvalid(struct policydb *p, struct cond_expr_node *expr)return 0 ; } -if (expr->boolean > p->p_bools.nprim) { +if (expr->expr_type ==COND_BOOL && + (expr->boolean ==0 || expr->boolean > p->p_bools.nprim)) {pr_err ("SELinux: conditional expressions uses unknown bool.\n" );return 0 ; }
security/selinux/ss/constraint.h +1 -0
@@ -50,6 +50,7 @@ struct constraint_expr {u32 op;/* operator */ struct ebitmap names;/* names */ +/* internally unused, only forwarded via policydb_write() */ struct type_set *type_names;struct constraint_expr *next;/* next expression */
security/selinux/ss/policydb.c +161 -35
402 lines not on this page · raw message
security/selinux/ss/policydb.h +19 -4
@@ -74,7 +74,7 @@ struct class_datum {/* Role attributes */ struct role_datum {u32 value;/* internal role value */ -u32 bounds;/* boundary of role */ +u32 bounds;/* boundary of role, 0 for none */ struct ebitmap dominates;/* set of roles dominated by this role */ struct ebitmap types;/* set of authorized types for role */ };
@@ -110,7 +110,8 @@ struct role_allow {/* Type attributes */ struct type_datum {u32 value;/* internal type value */ -u32 bounds;/* boundary of type */ +u32 bounds;/* boundary of type, 0 for none */ +/* internally unused, only forwarded via policydb_write() */ unsigned char primary;/* primary name? */ unsigned char attribute;/* attribute ?*/ };
@@ -118,7 +119,7 @@ struct type_datum {/* User attributes */ struct user_datum {u32 value;/* internal user value */ -u32 bounds;/* bounds of user */ +u32 bounds;/* bounds of user, 0 for none */ struct ebitmap roles;/* set of authorized roles for user */ struct mls_range range;/* MLS range (min - max) for user */ struct mls_level dfltlevel;/* default login MLS level for user */
@@ -195,7 +196,7 @@ struct ocontext { } ibendport; } u;union { -u16 sclass;/* security class for genfs */ +u16 sclass;/* security class for genfs (can be 0 for wildcard) */ u32 behavior;/* labeling behavior for fs_use */ } v;struct context context[2 ];/* security context(s) */
@@ -388,9 +389,23 @@ static inline char *sym_name(struct policydb *p, unsigned int sym_num, return p->sym_val_to_name[sym_num][element_nr]; } +static inline bool val_is_boolean (u32 value) +{ +return value ==0 || value ==1 ; +} +extern int str_read (char **strp,gfp_t flags,struct policy_file *fp,u32 len);extern u16 string_to_security_class (struct policydb *p,const char *name);extern u32 string_to_av_perm (struct policydb *p,u16 tclass,const char *name); +#define pr_warn_once_policyload (policy, fmt, ...) \ + do { \ + static const void *prev_policy__; \ + if (prev_policy__ != policy) { \ + pr_warn(fmt, ##__VA_ARGS__); \ + prev_policy__ = policy; \ + } \ + } while (0) +#endif /* _SS_POLICYDB_H_ */
security/selinux/ss/services.c +2 -4
@@ -446,8 +446,6 @@ static int dump_masked_av_helper(void *k, void *d, void *args)struct perm_datum *pdatum = d;char **permission_names = args; -BUG_ON (pdatum->value <1 || pdatum->value >32 ); - permission_names[pdatum->value -1 ] = (char *)k;return 0 ;
@@ -466,7 +464,7 @@ static void security_dump_masked_av(struct policydb *policydb,char *tclass_name;char *scontext_name =NULL ;char *tcontext_name =NULL ; -char *permission_names[32 ]; +char *permission_names[SEL_VEC_MAX ];int index;u32 length;bool need_comma = false;
@@ -507,7 +505,7 @@ static void security_dump_masked_av(struct policydb *policydb,"scontext=%s tcontext=%s tclass=%s perms=" , reason, scontext_name, tcontext_name, tclass_name); -for (index =0 ; index <32 ; index++) { +for (index =0 ; index <SEL_VEC_MAX ; index++) {u32 mask = (1 << index);if ((mask & permissions) ==0 )
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/3 selinux: require a class's permission values to cover its permission count
In reply to Sasha LevinFrom: Bryam Vargas <[email protected]>
[ Upstream commit b98a8ac50775540f3804397ed08f61ef9910bcab ]
security_get_permissions() sizes an array by the class's permissions.nprim and fills it at value - 1, from the inherited common's permission table and then the class's own. A value no permission defines leaves a NULL that sel_make_perm_files() passes to d_alloc_name(), an oops inside sel_write_load() that strands selinux_state.policy_mutex and leaves every later load in uninterruptible sleep; two permissions sharing a value overwrite the first kstrdup(). Bounding each value by nprim catches neither, and neither would a count: the symbol table is keyed on the permission name, so duplicates pass.
Track the values each permission table claims and require them to cover exactly what its count declares, rejecting a count no value can reach. Conforming policies are unaffected.
--- security/selinux/ss/policydb.c | 51 ++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 5 deletions(-)
security/selinux/ss/policydb.c +46 -5
@@ -1138,7 +1138,18 @@ int str_read(char **strp, gfp_t flags, struct policy_file *fp, u32 len)return 0 ; } -static int perm_read (struct policydb *p,struct symtab *s,struct policy_file *fp) +/* +* Bitmap of the permission values a symtab has claimed. Values are 1-based +* and bounded by SEL_VEC_MAX, the width of an access vector, so the whole set +* fits in a u32 and the callers reject an nprim past that width. +*/ +static u32 perm_claimed_mask (u32 nprim) +{ +return nprim ?U32_MAX >> (SEL_VEC_MAX - nprim) :0 ; +} + +static int perm_read (struct policydb *p,struct symtab *s, +struct policy_file *fp,u32 *claimed) {char *key =NULL ;struct perm_datum *perdatum;
@@ -1170,6 +1181,10 @@ static int perm_read(struct policydb *p, struct symtab *s, struct policy_file *f/* indexes an nprim-sized array in security_get_permissions() */ if (perdatum->value > s->nprim) goto bad; +/* two permissions cannot share one slot of that array */ +if (*claimed & (1U << (perdatum->value -1 ))) + goto bad; + *claimed |=1U << (perdatum->value -1 );return 0 ; bad:
@@ -1182,7 +1197,7 @@ static int common_read(struct policydb *p, struct symtab *s, struct policy_filechar *key =NULL ;struct common_datum *comdatum;__le32 buf[4 ]; -u32 i, len, nel; +u32 i, len, nel, claimed =0 ;int rc; comdatum =kzalloc_obj (*comdatum);
@@ -1204,17 +1219,28 @@ static int common_read(struct policydb *p, struct symtab *s, struct policy_fileif (rc) goto bad; comdatum->permissions.nprim =le32_to_cpu (buf[2 ]); +/* no permission value can reach a slot past SEL_VEC_MAX */ + rc = -EINVAL ; +if (comdatum->permissions.nprim >SEL_VEC_MAX ) + goto bad; rc =str_read (&key,GFP_KERNEL , fp, len);if (rc) goto bad;for (i =0 ; i < nel; i++) { - rc =perm_read (p, &comdatum->permissions, fp); + rc =perm_read (p, &comdatum->permissions, fp, &claimed);if (rc) goto bad; } + rc = -EINVAL ; +if (claimed !=perm_claimed_mask (comdatum->permissions.nprim)) { +pr_err ("SELinux: common %s does not define every permission it declares\n" , + key); + goto bad; + } +hash_eval (&comdatum->permissions.table,"common_permissions" , key); rc =symtab_insert (s, key, comdatum);
@@ -1348,7 +1374,7 @@ static int class_read(struct policydb *p, struct symtab *s, struct policy_file *char *key =NULL ;struct class_datum *cladatum;__le32 buf[6 ]; -u32 i, len, len2, ncons, nel, val; +u32 i, len, len2, ncons, nel, val, claimed =0 , inherited =0 ;int rc; cladatum =kzalloc_obj (*cladatum);
@@ -1376,6 +1402,10 @@ static int class_read(struct policydb *p, struct symtab *s, struct policy_file *if (rc) goto bad; cladatum->permissions.nprim =le32_to_cpu (buf[3 ]); +/* no permission value can reach a slot past SEL_VEC_MAX */ + rc = -EINVAL ; +if (cladatum->permissions.nprim >SEL_VEC_MAX ) + goto bad; ncons =le32_to_cpu (buf[5 ]);
@@ -1410,11 +1440,22 @@ static int class_read(struct policydb *p, struct symtab *s, struct policy_file * } }for (i =0 ; i < nel; i++) { - rc =perm_read (p, &cladatum->permissions, fp); + rc =perm_read (p, &cladatum->permissions, fp, &claimed);if (rc) goto bad; } +/* the class's own permissions must claim the slots the common leaves */ +if (cladatum->comdatum) + inherited = cladatum->comdatum->permissions.nprim; + rc = -EINVAL ; +if (claimed != (perm_claimed_mask (cladatum->permissions.nprim) & + ~perm_claimed_mask (inherited))) { +pr_err ("SELinux: class %s does not define every permission it declares\n" , + key); + goto bad; + } +hash_eval (&cladatum->permissions.table,"class_permissions" , key); rc =read_cons_helper (p, &cladatum->constraints, ncons,0 , fp);
Signature · 1 line
2.53.0