Commit a2410b57 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

perf symbols: Fix unaligned access in get_x86_64_plt_disp()

Use memcpy() to avoid unaligned access.

Discovered using EXTRA_CFLAGS="-fsanitize=undefined -fsanitize=address".

Fixes: ce4c8e79 ("perf symbols: Get symbols for .plt.got for x86-64")
Reported-by: default avatarkernel test robot <yujie.liu@intel.com>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/oe-lkp/202303061424.6ad43294-yujie.liu@intel.com
Link: https://lore.kernel.org/r/20230316194156.8320-2-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c8bb2d76
...@@ -542,9 +542,12 @@ static u32 get_x86_64_plt_disp(const u8 *p) ...@@ -542,9 +542,12 @@ static u32 get_x86_64_plt_disp(const u8 *p)
n += 1; n += 1;
/* jmp with 4-byte displacement */ /* jmp with 4-byte displacement */
if (p[n] == 0xff && p[n + 1] == 0x25) { if (p[n] == 0xff && p[n + 1] == 0x25) {
u32 disp;
n += 2; n += 2;
/* Also add offset from start of entry to end of instruction */ /* Also add offset from start of entry to end of instruction */
return n + 4 + le32toh(*(const u32 *)(p + n)); memcpy(&disp, p + n, sizeof(disp));
return n + 4 + le32toh(disp);
} }
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment