LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] tracing/cfi: Fix cmp_entries_* functions signature mismatch
@ 2021-09-23 17:09 Kalesh Singh
2021-09-24 15:20 ` Sami Tolvanen
2021-10-13 22:08 ` Steven Rostedt
0 siblings, 2 replies; 6+ messages in thread
From: Kalesh Singh @ 2021-09-23 17:09 UTC (permalink / raw)
Cc: surenb, hridya, namhyung, samitolvanen, ndesaulniers,
kernel-team, Kalesh Singh, Steven Rostedt, Ingo Molnar,
linux-kernel
If CONFIG_CFI_CLANG=y, attempting to read an event histogram will cause
the kernel to panic due to failed CFI check.
1. echo 'hist:keys=common_pid' >> events/sched/sched_switch/trigger
2. cat >> events/sched/sched_switch/hist
3. kernel panices on attempting to read hist
This happens because the sort() function expects a generic
int (*)(const void *, const void *) pointer for the compare function.
To prevent this CFI failure, change tracing map cmp_entries_* function
signatures to match this.
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
---
kernel/trace/tracing_map.c | 40 ++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
index d6bddb157ef2..a8c80ebbf9da 100644
--- a/kernel/trace/tracing_map.c
+++ b/kernel/trace/tracing_map.c
@@ -834,19 +834,21 @@ int tracing_map_init(struct tracing_map *map)
return err;
}
-static int cmp_entries_dup(const struct tracing_map_sort_entry **a,
- const struct tracing_map_sort_entry **b)
+static int cmp_entries_dup(const void *__a, const void *__b)
{
int ret = 0;
+ const struct tracing_map_sort_entry *a
+ = *(const struct tracing_map_sort_entry **)__a;
+ const struct tracing_map_sort_entry *b
+ = *(const struct tracing_map_sort_entry **)__b;
- if (memcmp((*a)->key, (*b)->key, (*a)->elt->map->key_size))
+ if (memcmp(a->key, b->key, a->elt->map->key_size))
ret = 1;
return ret;
}
-static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
- const struct tracing_map_sort_entry **b)
+static int cmp_entries_sum(const void *__a, const void *__b)
{
const struct tracing_map_elt *elt_a, *elt_b;
struct tracing_map_sort_key *sort_key;
@@ -854,9 +856,13 @@ static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
tracing_map_cmp_fn_t cmp_fn;
void *val_a, *val_b;
int ret = 0;
+ const struct tracing_map_sort_entry *a
+ = *(const struct tracing_map_sort_entry **)__a;
+ const struct tracing_map_sort_entry *b
+ = *(const struct tracing_map_sort_entry **)__b;
- elt_a = (*a)->elt;
- elt_b = (*b)->elt;
+ elt_a = a->elt;
+ elt_b = b->elt;
sort_key = &elt_a->map->sort_key;
@@ -873,8 +879,7 @@ static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
return ret;
}
-static int cmp_entries_key(const struct tracing_map_sort_entry **a,
- const struct tracing_map_sort_entry **b)
+static int cmp_entries_key(const void *__a, const void *__b)
{
const struct tracing_map_elt *elt_a, *elt_b;
struct tracing_map_sort_key *sort_key;
@@ -882,9 +887,13 @@ static int cmp_entries_key(const struct tracing_map_sort_entry **a,
tracing_map_cmp_fn_t cmp_fn;
void *val_a, *val_b;
int ret = 0;
+ const struct tracing_map_sort_entry *a
+ = *(const struct tracing_map_sort_entry **)__a;
+ const struct tracing_map_sort_entry *b
+ = *(const struct tracing_map_sort_entry **)__b;
- elt_a = (*a)->elt;
- elt_b = (*b)->elt;
+ elt_a = a->elt;
+ elt_b = b->elt;
sort_key = &elt_a->map->sort_key;
@@ -989,10 +998,8 @@ static void sort_secondary(struct tracing_map *map,
struct tracing_map_sort_key *primary_key,
struct tracing_map_sort_key *secondary_key)
{
- int (*primary_fn)(const struct tracing_map_sort_entry **,
- const struct tracing_map_sort_entry **);
- int (*secondary_fn)(const struct tracing_map_sort_entry **,
- const struct tracing_map_sort_entry **);
+ int (*primary_fn)(const void *, const void *);
+ int (*secondary_fn)(const void *, const void *);
unsigned i, start = 0, n_sub = 1;
if (is_key(map, primary_key->field_idx))
@@ -1061,8 +1068,7 @@ int tracing_map_sort_entries(struct tracing_map *map,
unsigned int n_sort_keys,
struct tracing_map_sort_entry ***sort_entries)
{
- int (*cmp_entries_fn)(const struct tracing_map_sort_entry **,
- const struct tracing_map_sort_entry **);
+ int (*cmp_entries_fn)(const void *, const void *);
struct tracing_map_sort_entry *sort_entry, **entries;
int i, n_entries, ret;
base-commit: 58e2cf5d794616b84f591d4d1276c8953278ce24
--
2.33.0.685.g46640cef36-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] tracing/cfi: Fix cmp_entries_* functions signature mismatch
2021-09-23 17:09 [PATCH] tracing/cfi: Fix cmp_entries_* functions signature mismatch Kalesh Singh
@ 2021-09-24 15:20 ` Sami Tolvanen
2021-09-27 18:15 ` Kalesh Singh
2021-10-13 22:08 ` Steven Rostedt
1 sibling, 1 reply; 6+ messages in thread
From: Sami Tolvanen @ 2021-09-24 15:20 UTC (permalink / raw)
To: Kalesh Singh
Cc: surenb, Hridya Valsaraju, namhyung, Nick Desaulniers,
Android Kernel Team, Steven Rostedt, Ingo Molnar, LKML
Hi Kalesh,
On Thu, Sep 23, 2021 at 10:09 AM Kalesh Singh <kaleshsingh@google.com> wrote:
>
> If CONFIG_CFI_CLANG=y, attempting to read an event histogram will cause
> the kernel to panic due to failed CFI check.
>
> 1. echo 'hist:keys=common_pid' >> events/sched/sched_switch/trigger
> 2. cat >> events/sched/sched_switch/hist
> 3. kernel panices on attempting to read hist
>
> This happens because the sort() function expects a generic
> int (*)(const void *, const void *) pointer for the compare function.
> To prevent this CFI failure, change tracing map cmp_entries_* function
> signatures to match this.
>
> Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
> ---
> kernel/trace/tracing_map.c | 40 ++++++++++++++++++++++----------------
> 1 file changed, 23 insertions(+), 17 deletions(-)
>
> diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
> index d6bddb157ef2..a8c80ebbf9da 100644
> --- a/kernel/trace/tracing_map.c
> +++ b/kernel/trace/tracing_map.c
> @@ -834,19 +834,21 @@ int tracing_map_init(struct tracing_map *map)
> return err;
> }
>
> -static int cmp_entries_dup(const struct tracing_map_sort_entry **a,
> - const struct tracing_map_sort_entry **b)
> +static int cmp_entries_dup(const void *__a, const void *__b)
> {
> int ret = 0;
> + const struct tracing_map_sort_entry *a
> + = *(const struct tracing_map_sort_entry **)__a;
> + const struct tracing_map_sort_entry *b
> + = *(const struct tracing_map_sort_entry **)__b;
>
> - if (memcmp((*a)->key, (*b)->key, (*a)->elt->map->key_size))
> + if (memcmp(a->key, b->key, a->elt->map->key_size))
> ret = 1;
>
> return ret;
> }
>
> -static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> - const struct tracing_map_sort_entry **b)
> +static int cmp_entries_sum(const void *__a, const void *__b)
> {
> const struct tracing_map_elt *elt_a, *elt_b;
> struct tracing_map_sort_key *sort_key;
> @@ -854,9 +856,13 @@ static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> tracing_map_cmp_fn_t cmp_fn;
> void *val_a, *val_b;
> int ret = 0;
> + const struct tracing_map_sort_entry *a
> + = *(const struct tracing_map_sort_entry **)__a;
> + const struct tracing_map_sort_entry *b
> + = *(const struct tracing_map_sort_entry **)__b;
>
> - elt_a = (*a)->elt;
> - elt_b = (*b)->elt;
> + elt_a = a->elt;
> + elt_b = b->elt;
>
> sort_key = &elt_a->map->sort_key;
>
> @@ -873,8 +879,7 @@ static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> return ret;
> }
>
> -static int cmp_entries_key(const struct tracing_map_sort_entry **a,
> - const struct tracing_map_sort_entry **b)
> +static int cmp_entries_key(const void *__a, const void *__b)
> {
> const struct tracing_map_elt *elt_a, *elt_b;
> struct tracing_map_sort_key *sort_key;
> @@ -882,9 +887,13 @@ static int cmp_entries_key(const struct tracing_map_sort_entry **a,
> tracing_map_cmp_fn_t cmp_fn;
> void *val_a, *val_b;
> int ret = 0;
> + const struct tracing_map_sort_entry *a
> + = *(const struct tracing_map_sort_entry **)__a;
> + const struct tracing_map_sort_entry *b
> + = *(const struct tracing_map_sort_entry **)__b;
>
> - elt_a = (*a)->elt;
> - elt_b = (*b)->elt;
> + elt_a = a->elt;
> + elt_b = b->elt;
>
> sort_key = &elt_a->map->sort_key;
>
> @@ -989,10 +998,8 @@ static void sort_secondary(struct tracing_map *map,
> struct tracing_map_sort_key *primary_key,
> struct tracing_map_sort_key *secondary_key)
> {
> - int (*primary_fn)(const struct tracing_map_sort_entry **,
> - const struct tracing_map_sort_entry **);
> - int (*secondary_fn)(const struct tracing_map_sort_entry **,
> - const struct tracing_map_sort_entry **);
> + int (*primary_fn)(const void *, const void *);
> + int (*secondary_fn)(const void *, const void *);
> unsigned i, start = 0, n_sub = 1;
>
> if (is_key(map, primary_key->field_idx))
> @@ -1061,8 +1068,7 @@ int tracing_map_sort_entries(struct tracing_map *map,
> unsigned int n_sort_keys,
> struct tracing_map_sort_entry ***sort_entries)
> {
> - int (*cmp_entries_fn)(const struct tracing_map_sort_entry **,
> - const struct tracing_map_sort_entry **);
> + int (*cmp_entries_fn)(const void *, const void *);
> struct tracing_map_sort_entry *sort_entry, **entries;
> int i, n_entries, ret;
>
>
Thanks for the patch! This looks correct to me and fixes the function
type mismatch that trips CFI.
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Sami
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] tracing/cfi: Fix cmp_entries_* functions signature mismatch
2021-09-24 15:20 ` Sami Tolvanen
@ 2021-09-27 18:15 ` Kalesh Singh
2021-09-27 21:56 ` Steven Rostedt
0 siblings, 1 reply; 6+ messages in thread
From: Kalesh Singh @ 2021-09-27 18:15 UTC (permalink / raw)
To: Sami Tolvanen
Cc: Suren Baghdasaryan, Hridya Valsaraju, namhyung, Nick Desaulniers,
Android Kernel Team, Steven Rostedt, Ingo Molnar, LKML
On Fri, Sep 24, 2021 at 8:20 AM Sami Tolvanen <samitolvanen@google.com> wrote:
>
> Hi Kalesh,
>
> On Thu, Sep 23, 2021 at 10:09 AM Kalesh Singh <kaleshsingh@google.com> wrote:
> >
> > If CONFIG_CFI_CLANG=y, attempting to read an event histogram will cause
> > the kernel to panic due to failed CFI check.
> >
> > 1. echo 'hist:keys=common_pid' >> events/sched/sched_switch/trigger
> > 2. cat >> events/sched/sched_switch/hist
> > 3. kernel panices on attempting to read hist
> >
> > This happens because the sort() function expects a generic
> > int (*)(const void *, const void *) pointer for the compare function.
> > To prevent this CFI failure, change tracing map cmp_entries_* function
> > signatures to match this.
> >
> > Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
> > ---
> > kernel/trace/tracing_map.c | 40 ++++++++++++++++++++++----------------
> > 1 file changed, 23 insertions(+), 17 deletions(-)
> >
> > diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
> > index d6bddb157ef2..a8c80ebbf9da 100644
> > --- a/kernel/trace/tracing_map.c
> > +++ b/kernel/trace/tracing_map.c
> > @@ -834,19 +834,21 @@ int tracing_map_init(struct tracing_map *map)
> > return err;
> > }
> >
> > -static int cmp_entries_dup(const struct tracing_map_sort_entry **a,
> > - const struct tracing_map_sort_entry **b)
> > +static int cmp_entries_dup(const void *__a, const void *__b)
> > {
> > int ret = 0;
> > + const struct tracing_map_sort_entry *a
> > + = *(const struct tracing_map_sort_entry **)__a;
> > + const struct tracing_map_sort_entry *b
> > + = *(const struct tracing_map_sort_entry **)__b;
> >
> > - if (memcmp((*a)->key, (*b)->key, (*a)->elt->map->key_size))
> > + if (memcmp(a->key, b->key, a->elt->map->key_size))
> > ret = 1;
> >
> > return ret;
> > }
> >
> > -static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> > - const struct tracing_map_sort_entry **b)
> > +static int cmp_entries_sum(const void *__a, const void *__b)
> > {
> > const struct tracing_map_elt *elt_a, *elt_b;
> > struct tracing_map_sort_key *sort_key;
> > @@ -854,9 +856,13 @@ static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> > tracing_map_cmp_fn_t cmp_fn;
> > void *val_a, *val_b;
> > int ret = 0;
> > + const struct tracing_map_sort_entry *a
> > + = *(const struct tracing_map_sort_entry **)__a;
> > + const struct tracing_map_sort_entry *b
> > + = *(const struct tracing_map_sort_entry **)__b;
> >
> > - elt_a = (*a)->elt;
> > - elt_b = (*b)->elt;
> > + elt_a = a->elt;
> > + elt_b = b->elt;
> >
> > sort_key = &elt_a->map->sort_key;
> >
> > @@ -873,8 +879,7 @@ static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> > return ret;
> > }
> >
> > -static int cmp_entries_key(const struct tracing_map_sort_entry **a,
> > - const struct tracing_map_sort_entry **b)
> > +static int cmp_entries_key(const void *__a, const void *__b)
> > {
> > const struct tracing_map_elt *elt_a, *elt_b;
> > struct tracing_map_sort_key *sort_key;
> > @@ -882,9 +887,13 @@ static int cmp_entries_key(const struct tracing_map_sort_entry **a,
> > tracing_map_cmp_fn_t cmp_fn;
> > void *val_a, *val_b;
> > int ret = 0;
> > + const struct tracing_map_sort_entry *a
> > + = *(const struct tracing_map_sort_entry **)__a;
> > + const struct tracing_map_sort_entry *b
> > + = *(const struct tracing_map_sort_entry **)__b;
> >
> > - elt_a = (*a)->elt;
> > - elt_b = (*b)->elt;
> > + elt_a = a->elt;
> > + elt_b = b->elt;
> >
> > sort_key = &elt_a->map->sort_key;
> >
> > @@ -989,10 +998,8 @@ static void sort_secondary(struct tracing_map *map,
> > struct tracing_map_sort_key *primary_key,
> > struct tracing_map_sort_key *secondary_key)
> > {
> > - int (*primary_fn)(const struct tracing_map_sort_entry **,
> > - const struct tracing_map_sort_entry **);
> > - int (*secondary_fn)(const struct tracing_map_sort_entry **,
> > - const struct tracing_map_sort_entry **);
> > + int (*primary_fn)(const void *, const void *);
> > + int (*secondary_fn)(const void *, const void *);
> > unsigned i, start = 0, n_sub = 1;
> >
> > if (is_key(map, primary_key->field_idx))
> > @@ -1061,8 +1068,7 @@ int tracing_map_sort_entries(struct tracing_map *map,
> > unsigned int n_sort_keys,
> > struct tracing_map_sort_entry ***sort_entries)
> > {
> > - int (*cmp_entries_fn)(const struct tracing_map_sort_entry **,
> > - const struct tracing_map_sort_entry **);
> > + int (*cmp_entries_fn)(const void *, const void *);
> > struct tracing_map_sort_entry *sort_entry, **entries;
> > int i, n_entries, ret;
> >
> >
>
> Thanks for the patch! This looks correct to me and fixes the function
> type mismatch that trips CFI.
>
> Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Thanks for the review Sami.
Steve, will this get picked up for your tree?
>
> Sami
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] tracing/cfi: Fix cmp_entries_* functions signature mismatch
2021-09-27 18:15 ` Kalesh Singh
@ 2021-09-27 21:56 ` Steven Rostedt
0 siblings, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2021-09-27 21:56 UTC (permalink / raw)
To: Kalesh Singh
Cc: Sami Tolvanen, Suren Baghdasaryan, Hridya Valsaraju, namhyung,
Nick Desaulniers, Android Kernel Team, Ingo Molnar, LKML
On Mon, 27 Sep 2021 11:15:01 -0700
Kalesh Singh <kaleshsingh@google.com> wrote:
> >
> > Thanks for the patch! This looks correct to me and fixes the function
> > type mismatch that trips CFI.
> >
> > Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
>
> Thanks for the review Sami.
>
> Steve, will this get picked up for your tree?
Yeah, I can pull it through my tree, but as I'm currently traveling, I
can't give a proper ETA on when it will hit. But at the latest, I'll be
looking at all my patch queue next week.
-- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] tracing/cfi: Fix cmp_entries_* functions signature mismatch
2021-09-23 17:09 [PATCH] tracing/cfi: Fix cmp_entries_* functions signature mismatch Kalesh Singh
2021-09-24 15:20 ` Sami Tolvanen
@ 2021-10-13 22:08 ` Steven Rostedt
2021-10-14 1:39 ` Kalesh Singh
1 sibling, 1 reply; 6+ messages in thread
From: Steven Rostedt @ 2021-10-13 22:08 UTC (permalink / raw)
To: Kalesh Singh
Cc: surenb, hridya, namhyung, samitolvanen, ndesaulniers,
kernel-team, Ingo Molnar, linux-kernel
On Thu, 23 Sep 2021 17:09:07 +0000
Kalesh Singh <kaleshsingh@google.com> wrote:
This finally popped up into my queue (from all my traveling and running of
conferences :-p )
> If CONFIG_CFI_CLANG=y, attempting to read an event histogram will cause
> the kernel to panic due to failed CFI check.
>
> 1. echo 'hist:keys=common_pid' >> events/sched/sched_switch/trigger
> 2. cat >> events/sched/sched_switch/hist
Do you mean:
2. cat events/sched/sched_switch/hist
?
Small nits below.
> 3. kernel panices on attempting to read hist
>
> This happens because the sort() function expects a generic
> int (*)(const void *, const void *) pointer for the compare function.
> To prevent this CFI failure, change tracing map cmp_entries_* function
> signatures to match this.
>
> Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
> ---
> kernel/trace/tracing_map.c | 40 ++++++++++++++++++++++----------------
> 1 file changed, 23 insertions(+), 17 deletions(-)
>
> diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
> index d6bddb157ef2..a8c80ebbf9da 100644
> --- a/kernel/trace/tracing_map.c
> +++ b/kernel/trace/tracing_map.c
> @@ -834,19 +834,21 @@ int tracing_map_init(struct tracing_map *map)
> return err;
> }
>
> -static int cmp_entries_dup(const struct tracing_map_sort_entry **a,
> - const struct tracing_map_sort_entry **b)
> +static int cmp_entries_dup(const void *__a, const void *__b)
Instead of __a and __b, have it as:
const void *A, const void *B
> {
> int ret = 0;
> + const struct tracing_map_sort_entry *a
> + = *(const struct tracing_map_sort_entry **)__a;
> + const struct tracing_map_sort_entry *b
> + = *(const struct tracing_map_sort_entry **)__b;
Please put these before the ret, we like to have a "upside down xmas tree"
type of declaration, where longer lines come before shorter ones. Also,
this can be "prettified" as:
const struct tracing_map_sort_entry **pa = A;
const struct tracing_map_sort_entry **pb = B;
const struct tracing_map_sort_entry *a = *pa;
const struct tracing_map_sort_entry *b = *pb;
int ret = 0;
>
> - if (memcmp((*a)->key, (*b)->key, (*a)->elt->map->key_size))
> + if (memcmp(a->key, b->key, a->elt->map->key_size))
> ret = 1;
>
> return ret;
> }
>
> -static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> - const struct tracing_map_sort_entry **b)
> +static int cmp_entries_sum(const void *__a, const void *__b)
> {
> const struct tracing_map_elt *elt_a, *elt_b;
> struct tracing_map_sort_key *sort_key;
> @@ -854,9 +856,13 @@ static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> tracing_map_cmp_fn_t cmp_fn;
> void *val_a, *val_b;
> int ret = 0;
> + const struct tracing_map_sort_entry *a
> + = *(const struct tracing_map_sort_entry **)__a;
> + const struct tracing_map_sort_entry *b
> + = *(const struct tracing_map_sort_entry **)__b;
Same here.
>
> - elt_a = (*a)->elt;
> - elt_b = (*b)->elt;
> + elt_a = a->elt;
> + elt_b = b->elt;
>
> sort_key = &elt_a->map->sort_key;
>
> @@ -873,8 +879,7 @@ static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> return ret;
> }
>
> -static int cmp_entries_key(const struct tracing_map_sort_entry **a,
> - const struct tracing_map_sort_entry **b)
> +static int cmp_entries_key(const void *__a, const void *__b)
> {
> const struct tracing_map_elt *elt_a, *elt_b;
> struct tracing_map_sort_key *sort_key;
> @@ -882,9 +887,13 @@ static int cmp_entries_key(const struct tracing_map_sort_entry **a,
> tracing_map_cmp_fn_t cmp_fn;
> void *val_a, *val_b;
> int ret = 0;
> + const struct tracing_map_sort_entry *a
> + = *(const struct tracing_map_sort_entry **)__a;
> + const struct tracing_map_sort_entry *b
> + = *(const struct tracing_map_sort_entry **)__b;
And here.
Thanks, and sorry for the long delay.
-- Steve
>
> - elt_a = (*a)->elt;
> - elt_b = (*b)->elt;
> + elt_a = a->elt;
> + elt_b = b->elt;
>
> sort_key = &elt_a->map->sort_key;
>
> @@ -989,10 +998,8 @@ static void sort_secondary(struct tracing_map *map,
> struct tracing_map_sort_key *primary_key,
> struct tracing_map_sort_key *secondary_key)
> {
> - int (*primary_fn)(const struct tracing_map_sort_entry **,
> - const struct tracing_map_sort_entry **);
> - int (*secondary_fn)(const struct tracing_map_sort_entry **,
> - const struct tracing_map_sort_entry **);
> + int (*primary_fn)(const void *, const void *);
> + int (*secondary_fn)(const void *, const void *);
> unsigned i, start = 0, n_sub = 1;
>
> if (is_key(map, primary_key->field_idx))
> @@ -1061,8 +1068,7 @@ int tracing_map_sort_entries(struct tracing_map *map,
> unsigned int n_sort_keys,
> struct tracing_map_sort_entry ***sort_entries)
> {
> - int (*cmp_entries_fn)(const struct tracing_map_sort_entry **,
> - const struct tracing_map_sort_entry **);
> + int (*cmp_entries_fn)(const void *, const void *);
> struct tracing_map_sort_entry *sort_entry, **entries;
> int i, n_entries, ret;
>
>
> base-commit: 58e2cf5d794616b84f591d4d1276c8953278ce24
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] tracing/cfi: Fix cmp_entries_* functions signature mismatch
2021-10-13 22:08 ` Steven Rostedt
@ 2021-10-14 1:39 ` Kalesh Singh
0 siblings, 0 replies; 6+ messages in thread
From: Kalesh Singh @ 2021-10-14 1:39 UTC (permalink / raw)
To: Steven Rostedt
Cc: Suren Baghdasaryan, Hridya Valsaraju, Namhyung Kim,
Sami Tolvanen, Nick Desaulniers, Cc: Android Kernel, Ingo Molnar,
LKML
On Wed, Oct 13, 2021 at 3:08 PM Steven Rostedt <rostedt@goodmis.org> wrote:
>
> On Thu, 23 Sep 2021 17:09:07 +0000
> Kalesh Singh <kaleshsingh@google.com> wrote:
>
>
> This finally popped up into my queue (from all my traveling and running of
> conferences :-p )
>
>
> > If CONFIG_CFI_CLANG=y, attempting to read an event histogram will cause
> > the kernel to panic due to failed CFI check.
> >
> > 1. echo 'hist:keys=common_pid' >> events/sched/sched_switch/trigger
> > 2. cat >> events/sched/sched_switch/hist
>
> Do you mean:
>
> 2. cat events/sched/sched_switch/hist
>
> ?
>
> Small nits below.
Thanks Steve, v2 posted at
https://lore.kernel.org/r/20211014013704.2854890-1-kaleshsingh@google.com/
- Kalesh
>
> > 3. kernel panices on attempting to read hist
> >
> > This happens because the sort() function expects a generic
> > int (*)(const void *, const void *) pointer for the compare function.
> > To prevent this CFI failure, change tracing map cmp_entries_* function
> > signatures to match this.
> >
> > Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
> > ---
> > kernel/trace/tracing_map.c | 40 ++++++++++++++++++++++----------------
> > 1 file changed, 23 insertions(+), 17 deletions(-)
> >
> > diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
> > index d6bddb157ef2..a8c80ebbf9da 100644
> > --- a/kernel/trace/tracing_map.c
> > +++ b/kernel/trace/tracing_map.c
> > @@ -834,19 +834,21 @@ int tracing_map_init(struct tracing_map *map)
> > return err;
> > }
> >
> > -static int cmp_entries_dup(const struct tracing_map_sort_entry **a,
> > - const struct tracing_map_sort_entry **b)
> > +static int cmp_entries_dup(const void *__a, const void *__b)
>
> Instead of __a and __b, have it as:
>
> const void *A, const void *B
>
>
> > {
> > int ret = 0;
> > + const struct tracing_map_sort_entry *a
> > + = *(const struct tracing_map_sort_entry **)__a;
> > + const struct tracing_map_sort_entry *b
> > + = *(const struct tracing_map_sort_entry **)__b;
>
> Please put these before the ret, we like to have a "upside down xmas tree"
> type of declaration, where longer lines come before shorter ones. Also,
> this can be "prettified" as:
>
> const struct tracing_map_sort_entry **pa = A;
> const struct tracing_map_sort_entry **pb = B;
> const struct tracing_map_sort_entry *a = *pa;
> const struct tracing_map_sort_entry *b = *pb;
> int ret = 0;
>
> >
> > - if (memcmp((*a)->key, (*b)->key, (*a)->elt->map->key_size))
> > + if (memcmp(a->key, b->key, a->elt->map->key_size))
> > ret = 1;
> >
> > return ret;
> > }
> >
> > -static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> > - const struct tracing_map_sort_entry **b)
> > +static int cmp_entries_sum(const void *__a, const void *__b)
> > {
> > const struct tracing_map_elt *elt_a, *elt_b;
> > struct tracing_map_sort_key *sort_key;
> > @@ -854,9 +856,13 @@ static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> > tracing_map_cmp_fn_t cmp_fn;
> > void *val_a, *val_b;
> > int ret = 0;
> > + const struct tracing_map_sort_entry *a
> > + = *(const struct tracing_map_sort_entry **)__a;
> > + const struct tracing_map_sort_entry *b
> > + = *(const struct tracing_map_sort_entry **)__b;
>
> Same here.
>
> >
> > - elt_a = (*a)->elt;
> > - elt_b = (*b)->elt;
> > + elt_a = a->elt;
> > + elt_b = b->elt;
> >
> > sort_key = &elt_a->map->sort_key;
> >
> > @@ -873,8 +879,7 @@ static int cmp_entries_sum(const struct tracing_map_sort_entry **a,
> > return ret;
> > }
> >
> > -static int cmp_entries_key(const struct tracing_map_sort_entry **a,
> > - const struct tracing_map_sort_entry **b)
> > +static int cmp_entries_key(const void *__a, const void *__b)
> > {
> > const struct tracing_map_elt *elt_a, *elt_b;
> > struct tracing_map_sort_key *sort_key;
> > @@ -882,9 +887,13 @@ static int cmp_entries_key(const struct tracing_map_sort_entry **a,
> > tracing_map_cmp_fn_t cmp_fn;
> > void *val_a, *val_b;
> > int ret = 0;
> > + const struct tracing_map_sort_entry *a
> > + = *(const struct tracing_map_sort_entry **)__a;
> > + const struct tracing_map_sort_entry *b
> > + = *(const struct tracing_map_sort_entry **)__b;
>
> And here.
>
> Thanks, and sorry for the long delay.
>
> -- Steve
>
> >
> > - elt_a = (*a)->elt;
> > - elt_b = (*b)->elt;
> > + elt_a = a->elt;
> > + elt_b = b->elt;
> >
> > sort_key = &elt_a->map->sort_key;
> >
> > @@ -989,10 +998,8 @@ static void sort_secondary(struct tracing_map *map,
> > struct tracing_map_sort_key *primary_key,
> > struct tracing_map_sort_key *secondary_key)
> > {
> > - int (*primary_fn)(const struct tracing_map_sort_entry **,
> > - const struct tracing_map_sort_entry **);
> > - int (*secondary_fn)(const struct tracing_map_sort_entry **,
> > - const struct tracing_map_sort_entry **);
> > + int (*primary_fn)(const void *, const void *);
> > + int (*secondary_fn)(const void *, const void *);
> > unsigned i, start = 0, n_sub = 1;
> >
> > if (is_key(map, primary_key->field_idx))
> > @@ -1061,8 +1068,7 @@ int tracing_map_sort_entries(struct tracing_map *map,
> > unsigned int n_sort_keys,
> > struct tracing_map_sort_entry ***sort_entries)
> > {
> > - int (*cmp_entries_fn)(const struct tracing_map_sort_entry **,
> > - const struct tracing_map_sort_entry **);
> > + int (*cmp_entries_fn)(const void *, const void *);
> > struct tracing_map_sort_entry *sort_entry, **entries;
> > int i, n_entries, ret;
> >
> >
> > base-commit: 58e2cf5d794616b84f591d4d1276c8953278ce24
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-10-14 1:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-23 17:09 [PATCH] tracing/cfi: Fix cmp_entries_* functions signature mismatch Kalesh Singh
2021-09-24 15:20 ` Sami Tolvanen
2021-09-27 18:15 ` Kalesh Singh
2021-09-27 21:56 ` Steven Rostedt
2021-10-13 22:08 ` Steven Rostedt
2021-10-14 1:39 ` Kalesh Singh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).