diff mbox series

[v2] libsepol: add check for category value before printing

Message ID 20231115233207.51845-1-luhuaxin1@huawei.com (mailing list archive)
State Accepted
Commit d3c2992ed035
Delegated to: Petr Lautrbach
Headers show
Series [v2] libsepol: add check for category value before printing | expand

Commit Message

Huaxin Lu Nov. 15, 2023, 11:32 p.m. UTC 
From: Huaxin Lu <luhuaxin1@huawei.com>

In mls_semantic_level_expand(), there is a explicitly determine
whether category is 0, which may cause an potential integer
overflow in error branch.

Signed-off-by: Huaxin Lu <luhuaxin1@huawei.com>
---
 libsepol/src/expand.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

James Carter Nov. 16, 2023, 5:56 p.m. UTC | #1 
On Wed, Nov 15, 2023 at 9:04 PM <luhuaxin1@huawei.com> wrote:
>
> From: Huaxin Lu <luhuaxin1@huawei.com>
>
> In mls_semantic_level_expand(), there is a explicitly determine
> whether category is 0, which may cause an potential integer
> overflow in error branch.
>
> Signed-off-by: Huaxin Lu <luhuaxin1@huawei.com>

Acked-by: James Carter <jwcart2@gmail.com>

> ---
>  libsepol/src/expand.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
> index ee5f9185..9ed22bfd 100644
> --- a/libsepol/src/expand.c
> +++ b/libsepol/src/expand.c
> @@ -945,8 +945,8 @@ int mls_semantic_level_expand(mls_semantic_level_t * sl, mls_level_t * l,
>         for (cat = sl->cat; cat; cat = cat->next) {
>                 if (!cat->low || cat->low > cat->high) {
>                         ERR(h, "Category range is not valid %s.%s",
> -                           p->p_cat_val_to_name[cat->low - 1],
> -                           p->p_cat_val_to_name[cat->high - 1]);
> +                           cat->low > 0 ? p->p_cat_val_to_name[cat->low - 1] : "Invalid",
> +                           cat->high > 0 ? p->p_cat_val_to_name[cat->high - 1] : "Invalid");
>                         return -1;
>                 }
>                 for (i = cat->low - 1; i < cat->high; i++) {
> --
> 2.33.0
>
James Carter Nov. 21, 2023, 2:09 p.m. UTC | #2 
On Thu, Nov 16, 2023 at 12:56 PM James Carter <jwcart2@gmail.com> wrote:
>
> On Wed, Nov 15, 2023 at 9:04 PM <luhuaxin1@huawei.com> wrote:
> >
> > From: Huaxin Lu <luhuaxin1@huawei.com>
> >
> > In mls_semantic_level_expand(), there is a explicitly determine
> > whether category is 0, which may cause an potential integer
> > overflow in error branch.
> >
> > Signed-off-by: Huaxin Lu <luhuaxin1@huawei.com>
>
> Acked-by: James Carter <jwcart2@gmail.com>
>

Merged.
Thanks,
Jim

> > ---
> >  libsepol/src/expand.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
> > index ee5f9185..9ed22bfd 100644
> > --- a/libsepol/src/expand.c
> > +++ b/libsepol/src/expand.c
> > @@ -945,8 +945,8 @@ int mls_semantic_level_expand(mls_semantic_level_t * sl, mls_level_t * l,
> >         for (cat = sl->cat; cat; cat = cat->next) {
> >                 if (!cat->low || cat->low > cat->high) {
> >                         ERR(h, "Category range is not valid %s.%s",
> > -                           p->p_cat_val_to_name[cat->low - 1],
> > -                           p->p_cat_val_to_name[cat->high - 1]);
> > +                           cat->low > 0 ? p->p_cat_val_to_name[cat->low - 1] : "Invalid",
> > +                           cat->high > 0 ? p->p_cat_val_to_name[cat->high - 1] : "Invalid");
> >                         return -1;
> >                 }
> >                 for (i = cat->low - 1; i < cat->high; i++) {
> > --
> > 2.33.0
> >
diff mbox series

Patch

diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
index ee5f9185..9ed22bfd 100644
--- a/libsepol/src/expand.c
+++ b/libsepol/src/expand.c
@@ -945,8 +945,8 @@  int mls_semantic_level_expand(mls_semantic_level_t * sl, mls_level_t * l,
 	for (cat = sl->cat; cat; cat = cat->next) {
 		if (!cat->low || cat->low > cat->high) {
 			ERR(h, "Category range is not valid %s.%s",
-			    p->p_cat_val_to_name[cat->low - 1],
-			    p->p_cat_val_to_name[cat->high - 1]);
+			    cat->low > 0 ? p->p_cat_val_to_name[cat->low - 1] : "Invalid",
+			    cat->high > 0 ? p->p_cat_val_to_name[cat->high - 1] : "Invalid");
 			return -1;
 		}
 		for (i = cat->low - 1; i < cat->high; i++) {