diff options
| author | Muhammad Bilal <meatuni001@gmail.com> | 2026-07-28 17:54:55 +0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-09-01 12:15:16 +0200 |
| commit | ff917923f4fb9c83717ba135ee47d7e4c1567bb7 (patch) | |
| tree | c38fd8fcf58e1937b17fdbc6518b6f8b797fc15a /tools/perf/util/trace-event.c | |
| download | linux-stable-ff917923f4fb9c83717ba135ee47d7e4c1567bb7.tar.gz linux-stable-ff917923f4fb9c83717ba135ee47d7e4c1567bb7.zip | |
staging: rtl8723bs: fix OOB read in rtw_action_frame_parse()grafted
rtw_action_frame_parse() takes a frame_len parameter but never
actually checks it before indexing into the frame body:
const u8 *frame_body = frame + sizeof(struct ieee80211_hdr_3addr);
...
c = frame_body[0];
...
a = frame_body[1];
frame_body already points 24 bytes (sizeof(struct
ieee80211_hdr_3addr)) into frame, so reading frame_body[0] and
frame_body[1] requires frame_len >= 26. A management action frame
shorter than that (e.g. exactly 24 bytes, the minimum a malicious
peer can send) causes a 1-2 byte out-of-bounds read.
This is reachable from rtw_cfg80211_monitor_if_xmit_entry() and
cfg80211_rtw_mgmt_tx() in ioctl_cfg80211.c, both of which pass
attacker/user-influenced frame buffers and lengths straight through.
Add the missing length check before frame_body is dereferenced.
Fixes: 554c0a3abf216 ("staging: Add rtl8723bs sdio wifi driver")
Cc: stable@vger.kernel.org
Signed-off-by: Muhammad Bilal <meatuni001@gmail.com>
Link: https://patch.msgid.link/20260728125456.32359-3-meatuni001@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/util/trace-event.c')
| -rw-r--r-- | tools/perf/util/trace-event.c | 127 |
1 files changed, 127 insertions, 0 deletions
diff --git a/tools/perf/util/trace-event.c b/tools/perf/util/trace-event.c new file mode 100644 index 000000000..000c1e1d6 --- /dev/null +++ b/tools/perf/util/trace-event.c @@ -0,0 +1,127 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <errno.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <linux/kernel.h> +#include <linux/err.h> +#include <event-parse.h> +#include <api/fs/tracing_path.h> +#include <api/fs/fs.h> +#include "trace-event.h" +#include "machine.h" + +/* + * global trace_event object used by trace_event__tp_format + * + * TODO There's no cleanup call for this. Add some sort of + * __exit function support and call trace_event__cleanup + * there. + */ +static struct trace_event tevent; +static bool tevent_initialized; + +int trace_event__init(struct trace_event *t) +{ + struct tep_handle *pevent; + + trace_event__cleanup(t); + + pevent = tep_alloc(); + + if (pevent) { + t->plugin_list = tep_load_plugins(pevent); + t->pevent = pevent; + } + + return pevent ? 0 : -1; +} + +static int trace_event__init2(void) +{ + int be = tep_is_bigendian(); + struct tep_handle *pevent; + + if (trace_event__init(&tevent)) + return -1; + + pevent = tevent.pevent; + tep_set_flag(pevent, TEP_NSEC_OUTPUT); + tep_set_file_bigendian(pevent, be); + tep_set_local_bigendian(pevent, be); + tevent_initialized = true; + return 0; +} + +int trace_event__register_resolver(struct machine *machine, + tep_func_resolver_t *func) +{ + if (!tevent_initialized && trace_event__init2()) + return -1; + + return tep_set_function_resolver(tevent.pevent, func, machine); +} + +void trace_event__cleanup(struct trace_event *t) +{ + if (!t->pevent) + return; + + tep_unload_plugins(t->plugin_list, t->pevent); + tep_free(t->pevent); + t->pevent = NULL; + t->plugin_list = NULL; +} + +/* + * Returns pointer with encoded error via <linux/err.h> interface. + */ +static struct tep_event* +tp_format(const char *sys, const char *name) +{ + char *tp_dir = get_events_file(sys); + struct tep_handle *pevent = tevent.pevent; + struct tep_event *event = NULL; + char path[PATH_MAX]; + size_t size; + char *data; + int err; + + if (!tp_dir) + return ERR_PTR(-errno); + + scnprintf(path, PATH_MAX, "%s/%s/format", tp_dir, name); + put_events_file(tp_dir); + + err = filename__read_str(path, &data, &size); + if (err) + return ERR_PTR(err); + + tep_parse_format(pevent, &event, data, size, sys); + + free(data); + return event; +} + +/* + * Returns pointer with encoded error via <linux/err.h> interface. + */ +struct tep_event* +trace_event__tp_format(const char *sys, const char *name) +{ + if (!tevent_initialized && trace_event__init2()) + return ERR_PTR(-ENOMEM); + + return tp_format(sys, name); +} + +struct tep_event *trace_event__tp_format_id(int id) +{ + if (!tevent_initialized && trace_event__init2()) + return ERR_PTR(-ENOMEM); + + return tep_find_event(tevent.pevent, id); +} |
