diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-08-19 18:09:18 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-08-19 18:09:18 -0700 |
| commit | f444fea7896dbc267249d27f604082a51b8efca2 (patch) | |
| tree | d72e809d28ff7a1cb02f648c858d106de1be859d /kernel/trace/trace_events_hist.c | |
| parent | 9e5f10fe577be7974c721c0c2050fa6c967d4565 (diff) | |
| parent | f87d64319e6f980c82acfc9b95ed523d053fb7ac (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/ptp/Kconfig:
55c8fca1dae1 ("ptp_pch: Restore dependency on PCI")
e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'kernel/trace/trace_events_hist.c')
| -rw-r--r-- | kernel/trace/trace_events_hist.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 949ef09dc537..a48aa2a2875b 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -3430,6 +3430,8 @@ trace_action_create_field_var(struct hist_trigger_data *hist_data, event = data->match_data.event; } + if (!event) + goto free; /* * At this point, we're looking at a field on another * event. Because we can't modify a hist trigger on |