Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 5.4-2.1.x-imx up to v5.4.115 #320

Merged
merged 24 commits into from
Apr 28, 2021
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
835c8d6
s390/ptrace: return -ENOSYS when invalid syscall is supplied
svens-s390 Mar 6, 2020
dbb3559
gpio: omap: Save and restore sysconfig
tmlind Apr 17, 2021
37ee803
pinctrl: lewisburg: Update number of pins in community
Apr 12, 2021
c6eb92b
arm64: dts: allwinner: Revert SD card CD GPIO for Pine64-LTS
Andre-ARM Apr 14, 2021
82808cc
locking/qrwlock: Fix ordering in queued_write_lock_slowpath()
AGSaidi Apr 15, 2021
319a06e
perf/x86/intel/uncore: Remove uncore extra PCI dev HSWEP_PCI_PCU_3
Apr 15, 2021
3963828
perf/x86/kvm: Fix Broadwell Xeon stepping in isolation_ucodes[]
jsmattsonjr Apr 22, 2021
aefb6ac
perf auxtrace: Fix potential NULL pointer dereference
Apr 20, 2021
a4e2b91
HID: google: add don USB id
Mar 2, 2021
116ee59
HID: alps: fix error return code in alps_input_configured()
XidianGeneral Mar 4, 2021
be60afb
HID: wacom: Assign boolean values to a bool variable
Jan 20, 2021
caaf937
ARM: dts: Fix swapped mmc order for omap3
tmlind Mar 24, 2021
026490f
net: geneve: check skb is large enough for IPv4/IPv6 header
PhilPotter Apr 11, 2021
78687d6
s390/entry: save the caller of psw_idle
Apr 8, 2021
2ccca12
xen-netback: Check for hotplug-status existence before watching
mcb30 Apr 13, 2021
892f6bc
cavium/liquidio: Fix duplicate argument
Apr 14, 2021
3dce9c4
csky: change a Kconfig symbol name to fix e1000 build error
rddunlap Apr 16, 2021
763cbe5
ia64: fix discontig.c section mismatches
rddunlap Apr 16, 2021
b3962b4
ia64: tools: remove duplicate definition of ia64_mf() on ia64
glaubitz Apr 16, 2021
699017f
x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access
Apr 16, 2021
d7fad2c
net: hso: fix NULL-deref on disconnect regression
jhovold Apr 26, 2021
af7099b
USB: CDC-ACM: fix poison/unpoison imbalance
oneukum Apr 21, 2021
19bfeb4
Linux 5.4.115
gregkh Apr 28, 2021
414754f
Merge tag 'v5.4.115' into 5.4-2.1.x-imx
zandrey Apr 28, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
perf auxtrace: Fix potential NULL pointer dereference
[ Upstream commit b14585d ]

In the function auxtrace_parse_snapshot_options(), the callback pointer
"itr->parse_snapshot_options" can be NULL if it has not been set during
the AUX record initialization.  This can cause tool crashing if the
callback pointer "itr->parse_snapshot_options" is dereferenced without
performing NULL check.

Add a NULL check for the pointer "itr->parse_snapshot_options" before
invoke the callback.

Fixes: d20031b ("perf tools: Add AUX area tracing Snapshot Mode")
Signed-off-by: Leo Yan <[email protected]>
Acked-by: Adrian Hunter <[email protected]>
Cc: Adrian Hunter <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Mark Rutland <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Tiezhu Yang <[email protected]>
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
Leo Yan authored and gregkh committed Apr 28, 2021
commit aefb6ac6ac111c50ba5dfae3f015ca03b1b84d7f
2 changes: 1 addition & 1 deletion tools/perf/util/auxtrace.c
Original file line number Diff line number Diff line change
@@ -586,7 +586,7 @@ int auxtrace_parse_snapshot_options(struct auxtrace_record *itr,
break;
}

if (itr)
if (itr && itr->parse_snapshot_options)
return itr->parse_snapshot_options(itr, opts, str);

pr_err("No AUX area tracing to snapshot\n");